fix #15899

eclipse-sumo · Dec 12, 2024 · bdfdd92 · bdfdd92
1 parent b539394
commit bdfdd92
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/netedit/tools/GNEPythonTool.cpp b/src/netedit/tools/GNEPythonTool.cpp
@@ -150,7 +150,7 @@ GNEPythonTool::getCommand() const {
                     }
                     arguments += " ";
                 } else {
-                    arguments += ("\"" + option.second->getValueString() + "\" ");
+                    arguments += ("\"" + StringUtils::escapeShell(option.second->getValueString()) + "\" ");
                 }
             }
         }
@@ -209,7 +209,7 @@ GNEPythonTool::saveConfiguration(const std::string& file) const {
             if (option.second->isBool()) {
                 command += ("--" + option.first + " ");
             } else {
-                command += ("--" + option.first + " \"" + option.second->getValueString() + "\" ");
+                command += ("--" + option.first + " \"" + StringUtils::escapeShell(option.second->getValueString()) + "\" ");
             }
         }
     }

diff --git a/src/utils/common/StringUtils.cpp b/src/utils/common/StringUtils.cpp
@@ -246,6 +246,13 @@ StringUtils::escapeXML(const std::string& orig, const bool maskDoubleHyphen) {
 }
 
 
+std::string
+StringUtils::escapeShell(const std::string& orig) {
+    std::string result = replace(orig, "\"", "\\\"");
+    return result;
+}
+
+
 std::string
 StringUtils::urlEncode(const std::string& toEncode, const std::string encodeWhich) {
     std::ostringstream out;

diff --git a/src/utils/common/StringUtils.h b/src/utils/common/StringUtils.h
@@ -82,6 +82,11 @@ class StringUtils {
      */
     static std::string escapeXML(const std::string& orig, const bool maskDoubleHyphen = false);
 
+    /**
+     * @brief Escape special characters with backslash
+     */
+    static std::string escapeShell(const std::string& orig);
+
     /// @brief An empty string
     static std::string emptyString;