[X2Go-Commits] [x2goserver] 81/99: x2goserver/bin/x2goupdateoptionsstring: don't encode/decode in-place.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit db1fd92a629c9c16824aa3d8f0ea03d736eeee3e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 29 16:34:50 2020 +0100

    x2goserver/bin/x2goupdateoptionsstring: don't encode/decode in-place.
---
 debian/changelog                       | 1 +
 x2goserver/bin/x2goupdateoptionsstring | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8ea67d2..c1350481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -352,6 +352,7 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
     - x2goserver/bin/x2goupdateoptionsstring: correctly use MIME::Base64.
     - x2goserver/bin/x2goupdateoptionsstring: actually implement extraction
       mode.
+    - x2goserver/bin/x2goupdateoptionsstring: don't encode/decode in-place.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2goupdateoptionsstring b/x2goserver/bin/x2goupdateoptionsstring
index 1c5d6dd0..9871c6b0 100755
--- a/x2goserver/bin/x2goupdateoptionsstring
+++ b/x2goserver/bin/x2goupdateoptionsstring
@@ -50,7 +50,7 @@ use List::Util qw (max);
 use Encode qw (encode decode);
 
 # Convert data in ARGV.
-exit (Main (map { decode ("UTF-8", $_, Encode::FB_CROAK); } @ARGV));
+exit (Main (map { decode ("UTF-8", $_, (Encode::FB_CROAK | Encode::LEAVE_SRC)); } @ARGV));
 
 BEGIN {
 }
@@ -652,7 +652,7 @@ sub Main {
         }
         else {
           # Convert into bytes.
-          my $bytes = encode ("UTF-8", $extract, Encode::FB_CROAK);
+          my $bytes = Encode::encode ("UTF-8", $extract, (Encode::FB_CROAK | Encode::LEAVE_SRC));
 
           # Encode the data.
           my $base64 = MIME::Base64::encode_base64 ($extract, q{});

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git