[X2Go-Commits] [x2goserver] 56/99: x2goserver/lib/x2goupdateoptionsstring: fix parsing of multiple subsequent separating "--" pseudo-options.

[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 61ee4509e6c459eb2658d777c8261e782aaf6bef
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 21 22:15:49 2020 +0100

    x2goserver/lib/x2goupdateoptionsstring: fix parsing of multiple subsequent separating "--" pseudo-options.
    
    We just have to make sure to treat subsequent pseudo-options literally
    and to not just consume them.
---
 debian/changelog                       | 3 +++
 x2goserver/bin/x2goupdateoptionsstring | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2d215ad1..d6148679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -296,6 +296,9 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       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.
+    - x2goserver/lib/x2goupdateoptionsstring: fix parsing of multiple
+      subsequent separating "--" pseudo-options. We just have to make sure to
+      treat subsequent pseudo-options literally and to not just consume them.
   * 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 c867e7c4..08d8ab92 100755
--- a/x2goserver/bin/x2goupdateoptionsstring
+++ b/x2goserver/bin/x2goupdateoptionsstring
@@ -88,8 +88,11 @@ sub sanitize_program_options {
         elsif ((2 == length ($cur_arg)) && (q{-} eq substr ($cur_arg, 1, 1))) {
           if ($skip_separator) {
             # Found separating "--" pseudo-option, but skipping requested. Only
-            # set the boolean value for our return value.
+            # set the boolean value for our return value and make sure that we
+            # don't skip another separating pseudo-option if it comes up again
+            # right next to this one.
             $found_separator = 1;
+            $skip_separator = 0;
           }
           else {
             # Not skipping separating "--" pseudo-option - i.e., we'll treat this

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