[X2Go-Commits] [x2goclient] 208/217: src/pulsemanager.cpp: make PA version parsing function more generic and don't expect that a number is always terminated with a period or dash.

27 Aug 2016

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit e28e785eb3323c5d1b763e946ef5941935b8d30f
Author: Mihai Moldovan <ionic@ionic.de>
Date:   Mon Jul 11 05:22:09 2016 +0200

    src/pulsemanager.cpp: make PA version parsing function more generic and don't expect that a number is always terminated with a period or dash.
    
    Especially on Windows, with a PA version number of "6.0", this lead to
    errors. OS X was fine with its "8.0.0-something" version number, but the
    optional part at the end or even the micro version number could be
    missing any time.
---
 debian/changelog     |    6 ++
 src/pulsemanager.cpp |  165 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 105 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57a8620..b9e65ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -383,6 +383,12 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
       initializing in_addr-type variable, the C-style universal zero
       initializer won't cut it here.
     - src/pulsemanager.h: include accidentally omitted wapi.h header file.
+    - src/pulsemanager.cpp: make PA version parsing function more generic and
+      don't expect that a number is always terminated with a period or dash.
+      Especially on Windows, with a PA version number of "6.0", this lead to
+      errors. OS X was fine with its "8.0.0-something" version number, but the
+      optional part at the end or even the micro version number could be
+      missing any time.
   * debian/control:
     - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>.
     - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1fff171..1da7ea4 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -383,28 +383,32 @@ void PulseManager::fetch_pulseaudio_version () {
         tmp_str = tmp_str.mid (needle.size ());
 
         /* We should be at a digit now. */
-        bool numbers_found[3] = { false, false, false };
-        QString tmp_ret_str = QString ("");
+        bool numbers_started[3] = { false, false, false };
+        bool numbers_finished[3] = { false, false, false };
+        bool numbers_skip[3] = { false, false, false };
+        QString tmp_remaining_str = QString ("");
+        QString numbers[3] = { };
         for (QString::const_iterator cit = tmp_str.begin (); cit != tmp_str.end (); ++cit) {
-          if (!(numbers_found[0])) {
+          if (!(numbers_finished[0])) {
             if (((*cit) >= '0') && ((*cit) <= '9')) {
-              tmp_ret_str.append (*cit);
+              numbers[0].append (*cit);
+              numbers_started[0] = true;
             }
             else if ((*cit) == '.') {
-              /* First number part complete, let's convert the string and skip the period. */
-              numbers_found[0] = true;
-              bool convert_success = false;
-              pulse_version_major_ = tmp_ret_str.toUInt (&convert_success, 10);
-
-              if (!convert_success) {
-                x2goErrorf (20) << "Unable to convert major version number string to integer.";
-                show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version number!"),
-                                           tr ("Unable to convert major version number string to integer."),
-                                           true);
-                abort ();
-              }
-
-              tmp_ret_str = QString ("");
+              /* First number part complete and more to come, mark as done. */
+              numbers_finished[0] = true;
+            }
+            else if ((*cit) == '-') {
+              /* First number part complete and no more numbers, mark as done, and... */
+              numbers_finished[0] = true;
+
+              /*
+               * Skip all the other numbers (i.e., assume the default value.)
+               * This doesn't make a huge lot of sense for the first number,
+               * but let's make this robust...
+               */
+              numbers_skip[1] = true;
+              numbers_skip[2] = true;
             }
             else {
               x2goErrorf (21) << "Unexpected character found when parsing version string for major version number: '" << QString (*cit) << "'.";
@@ -415,36 +419,21 @@ void PulseManager::fetch_pulseaudio_version () {
               abort ();
             }
           }
-          else if (!(numbers_found[1])) {
+          else if (!(numbers_finished[1])) {
             if (((*cit) >= '0') && ((*cit) <= '9')) {
-              tmp_ret_str.append (*cit);
+              numbers[1].append (*cit);
+              numbers_started[1] = true;
             }
-            else if (((*cit) == '.') || ((*cit) == '-')) {
-              /*
-               * Second number part complete, let's convert the string and then check whether
-               * we stopped at a period or a dash character.
-               */
-              numbers_found[1] = true;
-              bool convert_success = false;
-              pulse_version_minor_ = tmp_ret_str.toUInt (&convert_success, 10);
-
-              if (!convert_success) {
-                x2goErrorf (22) << "Unable to convert minor version number string to integer.";
-                show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version number!"),
-                                           tr ("Unable to convert minor version number string to integer."),
-                                           true);
-                abort ();
-              }
-
-              tmp_ret_str = QString ("");
-
-              if ((*cit) == '-') {
-                /*
-                 * There will be no micro version, skip it entirely and assume the default
-                 * value of zero.
-                 */
-                numbers_found[2] = true;
-              }
+            else if ((*cit) == '.') {
+              /* Second number part complete and more to come, mark as done. */
+              numbers_finished[1] = true;
+            }
+            else if ((*cit) == '-') {
+              /* Second number part complete and no more numbers, mark as done, and... */
+              numbers_finished[1] = true;
+
+              /* Skip all the other numbers (i.e., assume the default value.) */
+              numbers_skip[2] = true;
             }
             else {
               x2goErrorf (23) << "Unexpected character found when parsing version string for minor version number: '" << QString (*cit) << "'.";
@@ -455,25 +444,14 @@ void PulseManager::fetch_pulseaudio_version () {
               abort ();
             }
           }
-          else if (!(numbers_found[2])) {
+          else if (!(numbers_finished[2])) {
             if (((*cit) >= '0') && ((*cit) <= '9')) {
-              tmp_ret_str.append (*cit);
+              numbers[2].append (*cit);
+              numbers_started[2] = true;
             }
             else if ((*cit) == '-') {
-              /* Third number part complete, let's convert the string and skip the period. */
-              numbers_found[2] = true;
-              bool convert_success = false;
-              pulse_version_micro_ = tmp_ret_str.toUInt (&convert_success, 10);
-
-              if (!convert_success) {
-                x2goErrorf (24) << "Unable to convert micro version number string to integer.";
-                show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version number!"),
-                                           tr ("Unable to convert micro version number string to integer."),
-                                           true);
-                abort ();
-              }
-
-              tmp_ret_str = QString ("");
+              /* Third number part complete and no more numbers, mark as done. */
+              numbers_finished[2] = true;
             }
             else {
               x2goErrorf (25) << "Unexpected character found when parsing version string for micro version number: '" << QString (*cit) << "'.";
@@ -486,15 +464,70 @@ void PulseManager::fetch_pulseaudio_version () {
           }
           else {
             /* Numbers should be good by now, let's fetch everything else. */
-            tmp_ret_str.append (*cit);
+            tmp_remaining_str.append (*cit);
+          }
+        }
+
+        bool numbers_done[3] = { false, false, false };
+
+        if (numbers_skip[0]) {
+          x2goErrorf (30) << "Supposed to skip major version number. Something is wrong.";
+          show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version number!"),
+                                     tr ("Supposed to skip major version number. "
+                                         "Something is wrong."),
+                                     true);
+          abort ();
+        }
+
+        /*     not skipping   and  ((met period or dash) or (have something to convert and met EOL)) */
+        if ((!numbers_skip[0]) && ((numbers_finished[0]) || (numbers_started[0]))) {
+          bool convert_success = false;
+          pulse_version_major_ = numbers[0].toUInt (&convert_success, 10);
+
+          if (!convert_success) {
+            x2goErrorf (20) << "Unable to convert major version number string to integer.";
+            show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version number!"),
+                                       tr ("Unable to convert major version number string to integer."),
+                                       true);
+            abort ();
+          }
+          else {
+            /* First number is enough to satisfy the "found" criterion. */
+            found = true;
+          }
+        }
+
+        /*     not skipping   and  ((met period or dash) or (have something to convert and met EOL)) */
+        if ((!numbers_skip[1]) && ((numbers_finished[1]) || (numbers_started[1]))) {
+          bool convert_success = false;
+          pulse_version_minor_ = numbers[1].toUInt (&convert_success, 10);
+
+          if (!convert_success) {
+            x2goErrorf (22) << "Unable to convert minor version number string to integer.";
+            show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version number!"),
+                                       tr ("Unable to convert minor version number string to integer."),
+                                       true);
+            abort ();
           }
         }
 
-        found = ((numbers_found[0]) && (numbers_found[1]) && (numbers_found[2]));
+        /*     not skipping   and  ((met period or dash) or (have something to convert and met EOL)) */
+        if ((!numbers_skip[2]) && ((numbers_finished[2]) || (numbers_started[2]))) {
+          bool convert_success = false;
+          pulse_version_micro_ = numbers[2].toUInt (&convert_success, 10);
+
+          if (!convert_success) {
+            x2goErrorf (24) << "Unable to convert micro version number string to integer.";
+            show_RichText_ErrorMsgBox (tr ("Error fetching PulseAudio version number!"),
+                                       tr ("Unable to convert micro version number string to integer."),
+                                       true);
+            abort ();
+          }
+        }
 
+        /* Misc version part will be set to the trailing string. */
         if (found) {
-          /* Misc version part will be set to the trailing string. */
-          pulse_version_misc_ = tmp_ret_str;
+          pulse_version_misc_ = tmp_remaining_str;
           break;
         }
       }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[X2Go-Commits] [x2goclient] 208/217: src/pulsemanager.cpp: make PA version parsing function more generic and don't expect that a number is always terminated with a period or dash.