Skip to content

GitLab

Commit 0f5ea2fc authored by Aart Bik's avatar Aart Bik Committed by The Android Automerger
Browse files

Fix potential buffer overrun. 

BUG=27840771

Change-Id: I240f188b2e8f4b45d90138cfb3b14869cf506452
parent f8ed7d3f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
libdex/OptInvocation.cpp
View file @ 0f5ea2fc
......@@ -87,9 +87,9 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName)
ALOGE("Can't get CWD while opening jar file");
return NULL;
}
strncat(absoluteFile, "/", kBufLen);
strncat(absoluteFile, "/", kBufLen - strlen(absoluteFile));
}
strncat(absoluteFile, fileName, kBufLen);
strncat(absoluteFile, fileName, kBufLen - strlen(absoluteFile));
/*
* Append the name of the Jar file entry, if any. This is not currently
......@@ -97,8 +97,8 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName)
* in a Jar.
*/
if (subFileName != NULL) {
strncat(absoluteFile, "/", kBufLen);
strncat(absoluteFile, subFileName, kBufLen);
strncat(absoluteFile, "/", kBufLen - strlen(absoluteFile));
strncat(absoluteFile, subFileName, kBufLen - strlen(absoluteFile));
}
/* Turn the path into a flat filename by replacing
......@@ -136,7 +136,7 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName)
/* Tack on the file name for the actual cache file path.
*/
strncat(nameBuf, absoluteFile, kBufLen);
strncat(nameBuf, absoluteFile, kBufLen - strlen(nameBuf));
ALOGV("Cache file for '%s' '%s' is '%s'", fileName, subFileName, nameBuf);
return strdup(nameBuf);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment