Bug fix causing a core dump in command line options parsing

snvandoorn · Jun 24, 2017 · 81fb262 · 81fb262
1 parent 63d4cc9
commit 81fb262
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/libs/utillib/options_base.cpp b/src/libs/utillib/options_base.cpp
@@ -32,8 +32,12 @@ namespace qblocks {
         if ((SFUint32)argc <= minArgs)  // the first arg is the program's name
             return usage("Not enough arguments presented.");
 
+        int nChars = 0;
+        for (int i=0; i<argc; i++) {
+            nChars += SFString(argv[i]).length();
+        }
         uint32_t nArgs = 0;
-        SFString *args = new SFString[argc+2];
+        SFString *args = new SFString[argc+nChars+2];
 
         bool hasStdIn = false;
         for (int i = 1 ; i < argc ; i++) {
@@ -155,6 +159,12 @@ namespace qblocks {
                 shortName += name[0];
                 longName = "-" + name;
             }
+            if (longName.Contains("(") && longName.Contains(")")) {
+                hotKey = longName;
+                nextTokenClear(hotKey,'(');
+                hotKey = nextTokenClear(hotKey, ')');
+                longName.ReplaceAny("()","");
+            }
         }
     }