[X2Go-Commits] [x2goserver] 55/99: X2Go/Server/Agent/NX/Options.pm: make sure to add/modify elements with an empty string or undef key and an undef value as an empty hash.

[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 d94c657edf1d664be314b8022e4f62d2e3be39c1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 21 22:01:57 2020 +0100

    X2Go/Server/Agent/NX/Options.pm: make sure to add/modify elements with an empty string or undef key and an undef value as an empty hash.
---
 X2Go/Server/Agent/NX/Options.pm | 9 ++++++++-
 debian/changelog                | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/X2Go/Server/Agent/NX/Options.pm b/X2Go/Server/Agent/NX/Options.pm
index 5f9b27f8..e1ad68cc 100644
--- a/X2Go/Server/Agent/NX/Options.pm
+++ b/X2Go/Server/Agent/NX/Options.pm
@@ -608,7 +608,14 @@ sub transform_intermediate {
         $ret = [ map { filter_option_modify ($work_option_key, $work_option_value, $_, --$elements_left) } @{$ret} ];
       }
       else {
-        my $new_opt = { $work_option_key => $work_option_value };
+        my $new_opt = { };
+
+        if (((defined ($work_option_key)) && (q{} ne $work_option_key)) || (defined ($work_option_value))) {
+          $new_opt->{$work_option_key} = $work_option_value;
+        }
+        else {
+          print {*STDERR} "Asked to add/modify empty key with no value, adding empty element though deprecated.\n";
+        }
 
         # No such option exists, we'll add it to the end of the current
         # options.
diff --git a/debian/changelog b/debian/changelog
index da923aac..2d215ad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -294,6 +294,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       digits. We actually meant to check against an empty string. Also,
       change the whole expression to not enclose everything in a negation but
       rather negate sub-terms as required.
+    - X2Go/Server/Agent/NX/Options.pm: make sure to add/modify elements with
+      an empty string or undef key and an undef value as an empty hash.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:

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