AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-20850 Use LocalMemory for cmd to prevent use after free

Browse Source
This commit is contained in:
Jeff Genovy 2019-10-15 00:05:52 -07:00
parent 1e65be7d1a
commit 727505bdda
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
icu4c/source/tools/pkgdata/pkgdata.cpp
View File

@ -66,6 +66,8 @@ U_DEFINE_LOCAL_OPEN_POINTER(LocalPipeFilePointer, FILE, pclose);
#endif
using icu::LocalMemory;
static void loadLists(UPKGOptions *o, UErrorCode *status);
static int32_t pkg_executeOptions(UPKGOptions *o);
@ -1527,9 +1529,7 @@ static int32_t pkg_generateLibraryFile(const char *targetDir, const char mode, c
static int32_t pkg_createWithAssemblyCode(const char *targetDir, const char mode, const char *gencFilePath) {
char tempObjectFile[SMALL_BUFFER_MAX_SIZE] = "";
char *cmd;
int32_t result = 0;
int32_t length = 0;
/* Remove the ending .s and replace it with .o for the new object file. */
@ -1539,22 +1539,22 @@ static int32_t pkg_createWithAssemblyCode(const char *targetDir, const char mode
length = static_cast<int32_t>(uprv_strlen(pkgDataFlags[COMPILER]) + uprv_strlen(pkgDataFlags[LIBFLAGS])
+ uprv_strlen(tempObjectFile) + uprv_strlen(gencFilePath) + BUFFER_PADDING_SIZE);
cmd = (char *)uprv_malloc(sizeof(char) * length);
if (cmd == NULL) {
LocalMemory<char> cmd((char *)uprv_malloc(sizeof(char) * length));
if (cmd.isNull()) {
return -1;
}
/* Generate the object file. */
sprintf(cmd, "%s %s -o %s %s",
sprintf(cmd.getAlias(), "%s %s -o %s %s",
pkgDataFlags[COMPILER],
pkgDataFlags[LIBFLAGS],
tempObjectFile,
gencFilePath);
result = runCommand(cmd);
uprv_free(cmd);
result = runCommand(cmd.getAlias());
if (result != 0) {
fprintf(stderr, "Error creating with assembly code. Failed command: %s\n", cmd);
fprintf(stderr, "Error creating with assembly code. Failed command: %s\n", cmd.getAlias());
return result;
}