Added check to fix unpaired quotes.

Author: mapron

src/Modules/RemoteTool/RemoteToolFrames.cpp

@@ -30,11 +30,10 @@ SocketFrame::State RemoteToolRequest::ReadInternal(ByteOrderDataStreamReader& st
     stream >> m_clientId;
     stream >> m_sessionId;
     stream >> m_fileData;
-    StringVector args;
-    stream >> args;
-    m_invocation.m_arglist = ParseArgumentList(args);
+    stream >> m_invocation.m_arglist.m_args;
     stream >> m_invocation.m_id.m_toolId;
     stream >> m_compression;
+    m_invocation.m_arglist.TryFixDoubleQuotes();
     return stOk;
 }
 

src/ToolExecutionInterface/ArgumentList.cpp

@@ -43,8 +43,12 @@ ArgumentList ParseArgumentList(const StringVector& unparsedArgs, const ArgumentP
     std::string  current;
     bool         startedQuote = false;
     auto         consume      = [&current, &args](bool force) {
-        if (force || !current.empty())
+        if (!current.empty() && *current.rbegin() == ' ')
+            current = current.size() == 1 ? "" : current.substr(0, current.size() - 1);
+
+        if (force || !current.empty()) {
             args.m_args.push_back(std::move(current));
+        }
         current.clear();
     };
     bool escapedNext = false;
@@ -78,8 +82,13 @@ ArgumentList ParseArgumentList(const StringVector& unparsedArgs, const ArgumentP
                 }
             }
         }
-        consume(false);
+        if (!startedQuote)
+            consume(false);
+        else
+            current += ' ';
     }
+
+    consume(false);
     return args;
 }
 
@@ -102,4 +111,25 @@ std::string ArgumentList::ToString(const ArgumentStringifySettings& settings) co
     return StringUtils::JoinString(escapedArgs, ' ');
 }
 
+void ArgumentList::TryFixDoubleQuotes()
+{
+    bool hasCorrectFormat = true;
+    for (const std::string& arg : m_args) {
+        if (arg == "\"") {
+            hasCorrectFormat = false;
+            break;
+        } else if (arg.size() >= 2) {
+            char b = *arg.begin();
+            char e = *arg.rbegin();
+            if ((b == '"' && e != '"') || (e == '"' && b != '"')) {
+                hasCorrectFormat = false;
+                break;
+            }
+        }
+    }
+    if (!hasCorrectFormat) {
+        *this = ParseArgumentList(m_args);
+    }
+}
+
 }

src/ToolExecutionInterface/ArgumentList.h

@@ -32,6 +32,7 @@ struct ArgumentList {
     StringVector m_args;
 
     std::string ToString(const ArgumentStringifySettings& settings = {}) const noexcept;
+    void        TryFixDoubleQuotes();
 };
 
 ArgumentList        ParseArgumentList(const StringVector& unparsedArgs, const ArgumentParseSettings& settings = {}) noexcept;