From c97cd7fe6d833ebee4e3317d13561082facbff9a Mon Sep 17 00:00:00 2001
From: Carol Yang <clyang@apple.com>
Date: Tue, 3 May 2022 08:46:45 -0700
Subject: [PATCH] [CI] Make SystemCommands take a StringBuilderBase to avoid
 extra stack usage (#17984)

---
 .../tests/suites/commands/system/SystemCommands.cpp    | 10 +++-------
 src/app/tests/suites/commands/system/SystemCommands.h  |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/app/tests/suites/commands/system/SystemCommands.cpp b/src/app/tests/suites/commands/system/SystemCommands.cpp
index 64dad4027dc59a..00ee019ffc9095 100644
--- a/src/app/tests/suites/commands/system/SystemCommands.cpp
+++ b/src/app/tests/suites/commands/system/SystemCommands.cpp
@@ -16,8 +16,6 @@
  *
  */
 
-#include <lib/support/StringBuilder.h>
-
 #include "SystemCommands.h"
 
 namespace {
@@ -36,8 +34,8 @@ CHIP_ERROR SystemCommands::Start(uint16_t discriminator, uint16_t port, const ch
     constexpr const char * scriptName = "Start.py";
 
     char command[kCommandMaxLen];
-    ReturnErrorOnFailure(
-        CreateCommonCommandArgs(command, sizeof(command), scriptDir, scriptName, registerKey, discriminator, port, kvs));
+    chip::StringBuilderBase builder(command, sizeof(command));
+    ReturnErrorOnFailure(CreateCommonCommandArgs(builder, scriptDir, scriptName, registerKey, discriminator, port, kvs));
     return RunInternal(command);
 }
 
@@ -80,13 +78,12 @@ CHIP_ERROR SystemCommands::RunInternal(const char * command)
     return ContinueOnChipMainThread(CHIP_NO_ERROR);
 }
 
-CHIP_ERROR SystemCommands::CreateCommonCommandArgs(char * commandBuffer, size_t commandBufferSize, const char * scriptDir,
+CHIP_ERROR SystemCommands::CreateCommonCommandArgs(chip::StringBuilderBase & builder, const char * scriptDir,
                                                    const char * scriptName, const char * registerKey, uint16_t discriminator,
                                                    uint16_t port, const char * kvs)
 {
     VerifyOrReturnError(registerKey != nullptr, CHIP_ERROR_INVALID_KEY_ID);
 
-    chip::StringBuilder<kCommandMaxLen> builder;
     builder.Add(scriptDir);
     builder.Add(scriptName);
     builder.Add(" ");
@@ -109,7 +106,6 @@ CHIP_ERROR SystemCommands::CreateCommonCommandArgs(char * commandBuffer, size_t
         builder.Add(kvs);
     }
     VerifyOrReturnError(builder.Fit(), CHIP_ERROR_BUFFER_TOO_SMALL);
-    strncpy(commandBuffer, builder.c_str(), commandBufferSize);
 
     return CHIP_NO_ERROR;
 }
diff --git a/src/app/tests/suites/commands/system/SystemCommands.h b/src/app/tests/suites/commands/system/SystemCommands.h
index 90ee895a3b11da..dc2a285c1ac961 100644
--- a/src/app/tests/suites/commands/system/SystemCommands.h
+++ b/src/app/tests/suites/commands/system/SystemCommands.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <lib/support/CodeUtils.h>
+#include <lib/support/StringBuilder.h>
 
 class SystemCommands
 {
@@ -36,7 +37,6 @@ class SystemCommands
 
 private:
     CHIP_ERROR RunInternal(const char * command);
-    CHIP_ERROR CreateCommonCommandArgs(char * commandBuffer, size_t commandBufferSize, const char * scriptDir,
-                                       const char * scriptName, const char * registerKey, uint16_t discriminator, uint16_t port,
-                                       const char * kvs);
+    CHIP_ERROR CreateCommonCommandArgs(chip::StringBuilderBase & builder, const char * scriptDir, const char * scriptName,
+                                       const char * registerKey, uint16_t discriminator, uint16_t port, const char * kvs);
 };