Include indent buffer length in TR_Debug::printByteCodeStack

Signed-off-by: Peter Shipton <[email protected]>
eclipse-openj9 · Nov 21, 2024 · dc29b6d · dc29b6d
1 parent 708db6e
commit dc29b6d
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/runtime/compiler/runtime/MetaDataDebug.cpp b/runtime/compiler/runtime/MetaDataDebug.cpp
@@ -546,7 +546,7 @@ extern "C" void jitBytecodePrintFunction(void *userData, char *format, ...)
    }
 
 void
-TR_Debug::printByteCodeStack(int32_t parentStackIndex, uint16_t byteCodeIndex, char * indent)
+TR_Debug::printByteCodeStack(int32_t parentStackIndex, uint16_t byteCodeIndex, char * indent, size_t bufLen)
    {
 #if defined(J9VM_OPT_JITSERVER)
    if (_comp->isOutOfProcessCompilation() || _comp->isRemoteCompilation())
@@ -558,14 +558,20 @@ TR_Debug::printByteCodeStack(int32_t parentStackIndex, uint16_t byteCodeIndex, c
       void *bcPrintFunc = (void *)jitBytecodePrintFunction;
       if (parentStackIndex == -1)
          {
-         sprintf(indent, " \\\\");
+         static const char indentString[] = " \\\\";
+         size_t indentSize = sizeof(indentString) - 1;
+         if (bufLen > indentSize)
+            {
+            strncpy(indent, indentString, indentSize + 1);
+            bufLen -= indentSize;
+            }
          trfprintf(_file, "%s %s\n", indent, _comp->getCurrentMethod()->signature(comp()->trMemory(), heapAlloc));
          ramMethod = (J9Method *)_comp->getCurrentMethod()->resolvedMethodAddress();
          }
       else
          {
          TR_InlinedCallSite & site = _comp->getInlinedCallSite(parentStackIndex);
-         printByteCodeStack(site._byteCodeInfo.getCallerIndex(), site._byteCodeInfo.getByteCodeIndex(), indent);
+         printByteCodeStack(site._byteCodeInfo.getCallerIndex(), site._byteCodeInfo.getByteCodeIndex(), indent, bufLen);
          ramMethod = (J9Method *)site._methodInfo;
          }
 
@@ -579,7 +585,13 @@ TR_Debug::printByteCodeStack(int32_t parentStackIndex, uint16_t byteCodeIndex, c
                              J9_CLASS_FROM_METHOD(ramMethod)->romClass,
                              J9_BYTECODE_START_FROM_RAM_METHOD(ramMethod),
                              byteCodeIndex, byteCodeIndex, flags, bcPrintFunc, this, indent);
-      sprintf(indent, "%s   ", indent);
+      static const char indentString2[] = "   ";
+      size_t indentSize2 = sizeof(indentString2) - 1;
+      size_t indentLen = strlen(indent);
+      if ((bufLen > indentSize2) && (indentLen < (bufLen - indentSize2)))
+         {
+         strncpy(indent, indentString2, indentSize2 + 1);
+         }
       }
    }