[chip-tool] In interactive server mode when a response is sent over t…

…he wire it keeps creating new strings instead of concatening to the already existing strings
project-chip · Jun 5, 2023 · 2cd6170 · 2cd6170
1 parent a90199c
commit 2cd6170
Showing 1 changed file with 27 additions and 15 deletions.
diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
@@ -153,47 +153,59 @@ struct InteractiveServerResult
     {
         auto lock = ScopedLock(mMutex);
 
-        std::string resultsStr;
+        std::stringstream results;
         if (mResults.size())
         {
             for (const auto & result : mResults)
             {
-                resultsStr = resultsStr + result + ",";
+                results << result << ",";
             }
 
             // Remove last comma.
-            resultsStr.pop_back();
+            results.seekp(-1, std::ios_base::end);
+            results << '\0';
         }
 
         if (mStatus != EXIT_SUCCESS)
         {
-            if (resultsStr.size())
+            if (results.tellp())
             {
-                resultsStr = resultsStr + ",";
+                results << ",";
             }
-            resultsStr = resultsStr + "{ \"error\": \"FAILURE\" }";
+            results << "{ \"error\": \"FAILURE\" }";
         }
 
-        std::string logsStr;
+        std::stringstream logs;
         if (mLogs.size())
         {
             for (const auto & log : mLogs)
             {
-                logsStr = logsStr + "{";
-                logsStr = logsStr + "  \"module\": \"" + log.module + "\",";
-                logsStr = logsStr + "  \"category\": \"" + log.messageType + "\",";
-                logsStr = logsStr + "  \"message\": \"" + log.message + "\"";
-                logsStr = logsStr + "},";
+                logs << "{"
+                        "  \"module\": \"" +
+                        log.module +
+                        "\","
+                        "  \"category\": \"" +
+                        log.messageType +
+                        "\","
+                        "  \"message\": \"" +
+                        log.message +
+                        "\""
+                        "},";
             }
 
             // Remove last comma.
-            logsStr.pop_back();
+            logs.seekp(-1, std::ios_base::end);
+            logs << '\0';
         }
 
+        auto resultsString  = results.str();
+        auto logsString     = logs.str();
+        auto resultsContent = resultsString.c_str();
+        auto logsContent    = logsString.c_str();
         std::string jsonLog;
         jsonLog = jsonLog + "{";
-        jsonLog = jsonLog + "  \"results\": [" + resultsStr + "],";
-        jsonLog = jsonLog + "  \"logs\": [" + logsStr + "]";
+        jsonLog = jsonLog + "  \"results\": [" + resultsContent + "],";
+        jsonLog = jsonLog + "  \"logs\": [" + logsContent + "]";
         jsonLog = jsonLog + "}";
 
         return jsonLog;