diff options
author | Aart Bik <ajcbik@google.com> | 2016-04-21 15:51:41 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-05-27 11:29:58 -0700 |
commit | 338aeaf28e9981c15d0673b18487dba61eb5447c (patch) | |
tree | 08b030eed25deb93283d48ae3f40d9f6a1f05e45 | |
parent | f8ed7d3f0ea87b3fc1aa72859386c82d8d9bdbd4 (diff) | |
download | android_dalvik-338aeaf28e9981c15d0673b18487dba61eb5447c.tar.gz android_dalvik-338aeaf28e9981c15d0673b18487dba61eb5447c.tar.bz2 android_dalvik-338aeaf28e9981c15d0673b18487dba61eb5447c.zip |
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 be7f70b50..bfad44b26 100644 --- a/libdex/OptInvocation.cpp +++ b/libdex/OptInvocation.cpp @@ -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); |