diff options
author | Aart Bik <ajcbik@google.com> | 2016-04-21 15:51:41 -0700 |
---|---|---|
committer | Aart Bik <ajcbik@google.com> | 2016-04-22 13:28:21 -0700 |
commit | 38025bc7fa31b231ae7b1575e0faf62a7f0953cf (patch) | |
tree | f978d364f23aa7ec5c0f2deefc4584aeee22c9af | |
parent | 36e356c96640775f0a3f167bd2426ea0f0093b8b (diff) | |
download | dalvik-38025bc7fa31b231ae7b1575e0faf62a7f0953cf.tar.gz |
Fix potential buffer overrun.
BUG=27840771
Change-Id: I240f188b2e8f4b45d90138cfb3b14869cf506452
-rw-r--r-- | libdex/OptInvocation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libdex/OptInvocation.cpp b/libdex/OptInvocation.cpp index bac2f247d..6b877188f 100644 --- a/libdex/OptInvocation.cpp +++ b/libdex/OptInvocation.cpp @@ -66,9 +66,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 @@ -76,8 +76,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 @@ -100,7 +100,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); |