diff options
| author | Aart Bik <ajcbik@google.com> | 2016-04-19 10:41:23 -0700 |
|---|---|---|
| committer | Aart Bik <ajcbik@google.com> | 2016-04-19 10:41:23 -0700 |
| commit | 5b9c1708bb861c8e8de47885769b633b2d86f0ac (patch) | |
| tree | 07300958d5bdc022fc2254ae4f7549d94f33fa24 | |
| parent | fa2200a3be02933e8359fabf009717cb01841940 (diff) | |
| download | dalvik-5b9c1708bb861c8e8de47885769b633b2d86f0ac.tar.gz | |
Potential buffer overflow fix in libdex.
BUG=27840771
Change-Id: I56442c376036372b005548d3e6a4060647639055
| -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); |