Skip to content

Commit 23b2711

Browse files
authored
Merge pull request #20672 from pshipton/sprintf0.49
(0.49) Replace sprintf with snprintf in many places
2 parents 1f961de + 6dbef03 commit 23b2711

24 files changed

+362
-147
lines changed

runtime/compiler/compile/J9Compilation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ J9::Compilation::allocateCompYieldStatsMatrix()
325325
for (int32_t j=0; j < (int32_t)LAST_CONTEXT; j++)
326326
{
327327
char buffer[128];
328-
sprintf(buffer, "%d-%d", i,j);
328+
snprintf(buffer, sizeof(buffer), "%d-%d", i,j);
329329
_compYieldStatsMatrix[i][j].setName(buffer);
330330
}
331331
}

runtime/compiler/compile/J9SymbolReferenceTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ J9::SymbolReferenceTable::methodSymRefWithSignature(TR::SymbolReference *origina
636636

637637
int32_t fullSignatureLength = originalMethod->classNameLength() + 1 + originalMethod->nameLength() + effectiveSignatureLength;
638638
char *fullSignature = (char*)trMemory()->allocateMemory(1 + fullSignatureLength, stackAlloc);
639-
sprintf(fullSignature, "%.*s.%.*s%.*s", originalMethod->classNameLength(), originalMethod->classNameChars(), originalMethod->nameLength(), originalMethod->nameChars(), effectiveSignatureLength, effectiveSignature);
639+
snprintf(fullSignature, 1 + fullSignatureLength, "%.*s.%.*s%.*s", originalMethod->classNameLength(), originalMethod->classNameChars(), originalMethod->nameLength(), originalMethod->nameChars(), effectiveSignatureLength, effectiveSignature);
640640
TR_ASSERT(strlen(fullSignature) == fullSignatureLength, "Computed fullSignatureLength must match actual length of fullSignature");
641641
CS2::HashIndex hashIndex = 0;
642642
static char *ignoreMBSCache = feGetEnv("TR_ignoreMBSCache");

runtime/compiler/control/CompilationThread.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,8 +1128,8 @@ TR::CompilationInfoPerThread::CompilationInfoPerThread(TR::CompilationInfo &comp
11281128
// NOTE:
11291129
// the (char *) casts are done because on Z, sprintf expects
11301130
// a (char *) instead of a (const char *)
1131-
sprintf(_activeThreadName, (char *) selectedActiveThreadName, getCompThreadId());
1132-
sprintf(_suspendedThreadName, (char *) selectedSuspendedThreadName, getCompThreadId());
1131+
snprintf(_activeThreadName, activeThreadNameLength, (char *) selectedActiveThreadName, getCompThreadId());
1132+
snprintf(_suspendedThreadName, suspendedThreadNameLength, (char *) selectedSuspendedThreadName, getCompThreadId());
11331133

11341134
_initializationSucceeded = true;
11351135
}

runtime/compiler/control/DLLMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ IDATA J9VMDllMain(J9JavaVM* vm, IDATA stage, void * reserved)
641641
continue;
642642

643643
//char threadName[32]; // make sure the name below does not exceed 32 chars
644-
//sprintf(threadName, "JIT Compilation Thread-%d", curCompThreadInfoPT->getCompThreadId());
644+
//snprintf(threadName, sizeof(threadName), "JIT Compilation Thread-%d", curCompThreadInfoPT->getCompThreadId());
645645

646646
char *threadName = (
647647
curCompThreadInfoPT->compilationThreadIsActive() ?

runtime/compiler/control/HookedByTheJit.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ TR::OptionSet *findOptionSet(J9Method *method, bool isAOT)
200200

201201
if (methodSignature)
202202
{
203-
sprintf(methodSignature, "%.*s.%.*s%.*s", J9UTF8_LENGTH(className), utf8Data(className), J9UTF8_LENGTH(name), utf8Data(name), J9UTF8_LENGTH(signature), utf8Data(signature));
203+
snprintf(methodSignature, len, "%.*s.%.*s%.*s", J9UTF8_LENGTH(className), utf8Data(className), J9UTF8_LENGTH(name), utf8Data(name), J9UTF8_LENGTH(signature), utf8Data(signature));
204204

205205
TR_FilterBST * filter = 0;
206206
if (TR::Options::getDebug() && TR::Options::getDebug()->getCompilationFilters())
@@ -470,7 +470,7 @@ static void jitHookInitializeSendTarget(J9HookInterface * * hook, UDATA eventNum
470470
if (sigLen < 1024)
471471
{
472472
char sigC[1024];
473-
sigLen = sprintf(sigC, "%.*s.%.*s%.*s",
473+
snprintf(sigC, sizeof(sigC), "%.*s.%.*s%.*s",
474474
J9UTF8_LENGTH(className), utf8Data(className),
475475
J9UTF8_LENGTH(name), utf8Data(name),
476476
J9UTF8_LENGTH(signature), utf8Data(signature));
@@ -747,7 +747,7 @@ static void jitHookInitializeSendTarget(J9HookInterface * * hook, UDATA eventNum
747747
J9UTF8 * className = J9ROMCLASS_CLASSNAME(J9_CLASS_FROM_METHOD(method)->romClass);
748748
J9UTF8 * name = J9ROMMETHOD_NAME(J9_ROM_METHOD_FROM_RAM_METHOD(method));
749749
J9UTF8 * signature = J9ROMMETHOD_SIGNATURE(J9_ROM_METHOD_FROM_RAM_METHOD(method));
750-
int32_t sigLen = sprintf(buf, "%.*s.%.*s%.*s", J9UTF8_LENGTH(className), utf8Data(className), J9UTF8_LENGTH(name), utf8Data(name), J9UTF8_LENGTH(signature), utf8Data(signature));
750+
snprintf(buf, sizeof(buf), "%.*s.%.*s%.*s", J9UTF8_LENGTH(className), utf8Data(className), J9UTF8_LENGTH(name), utf8Data(name), J9UTF8_LENGTH(signature), utf8Data(signature));
751751
printf("Initial: Signature %s Count %d isLoopy %d isAOT %" OMR_PRIuPTR " is in SCC %d SCCContainsProfilingInfo %d \n",buf,TR::CompilationInfo::getInvocationCount(method),J9ROMMETHOD_HAS_BACKWARDS_BRANCHES(romMethod),
752752
TR::Options::sharedClassCache() ? jitConfig->javaVM->sharedClassConfig->existsCachedCodeForROMMethod(vmThread, romMethod) : 0,
753753
TR::Options::sharedClassCache() ? TR_J9VMBase::get(jitConfig, vmThread, TR_J9VMBase::AOT_VM)->sharedCache()->isClassInSharedCache(J9_CLASS_FROM_METHOD(method)) : 0,containsInfo) ; fflush(stdout);
@@ -1741,7 +1741,7 @@ static void initThreadAfterCreation(J9VMThread *vmThread)
17411741
char fileName[64];
17421742
IDATA tracefp= -1;
17431743

1744-
sprintf(fileName, "%s_" POINTER_PRINTF_FORMAT, pJitConfig->itraceFileNamePrefix, vmThread);
1744+
snprintf(fileName, sizeof(fileName), "%s_" POINTER_PRINTF_FORMAT, pJitConfig->itraceFileNamePrefix, vmThread);
17451745

17461746
if ((tracefp = j9file_open(fileName, EsOpenWrite | EsOpenAppend | EsOpenCreate, 0644)) == -1)
17471747
{

0 commit comments

Comments
 (0)