diff options
author | Aart Bik <ajcbik@google.com> | 2016-05-02 22:02:24 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-02 22:02:24 +0000 |
commit | 3bbe8817e6dbfcb64ea7a02fa46be533ce5718ab (patch) | |
tree | fdb73533e33f948d6c4195367aa23bdf42358d11 | |
parent | 1396cdeb03bf25c33d461a734f6ce739c8c5bc32 (diff) | |
parent | 46464a20e0f4f5ec22e1ca9c5fb9d7f603295f5c (diff) | |
download | dalvik-3bbe8817e6dbfcb64ea7a02fa46be533ce5718ab.tar.gz |
Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 am: 8e37aa191f am: e5c4e849e2
am: 46464a20e0
* commit '46464a20e0f4f5ec22e1ca9c5fb9d7f603295f5c':
Fix potential buffer overrun.
Change-Id: I180bcd9b425711745406725a2906f4854b7f3706
-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); |