[X2Go-Commits] [x2goserver] 72/99: x2goserver/bin/x2goupdateoptionsstring: sanitize/convert data in @ARGV.

[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 cc374ff78fc9830e8f7db714a7cfaee1c0143ca3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Nov 26 07:05:21 2020 +0100

    x2goserver/bin/x2goupdateoptionsstring: sanitize/convert data in @ARGV.
---
 debian/changelog                       | 1 +
 x2goserver/bin/x2goupdateoptionsstring | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 18632ee9..3ebc9408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -333,6 +333,7 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       far as possible.
     - {X2Go/Server/Agent/NX/Options.pm,
        x2goserver/bin/x2goupdateoptionsstring}: fatalize text coding errors.
+    - x2goserver/bin/x2goupdateoptionsstring: sanitize/convert data in @ARGV.
   * 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 64baca08..9494c465 100755
--- a/x2goserver/bin/x2goupdateoptionsstring
+++ b/x2goserver/bin/x2goupdateoptionsstring
@@ -46,8 +46,10 @@ use Storable qw (dclone);
 use Data::Dumper qw (Dumper);
 use X2Go::Server::Agent::NX::Options;
 use List::Util qw (max);
+use Encode qw (encode decode);
 
-exit (Main (@ARGV));
+# Convert data in ARGV.
+exit (Main (map { decode ("UTF-8", $_, Encode::FB_CROAK); } @ARGV));
 
 BEGIN {
 }

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