commit 02d370c4643a803125a6c827b488d42fd752c961
author Ivan Lozano <ivanlozano@google.com> Thu Dec 28 17:59:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 28 17:59:37 2017 +0000
tree dfdf2b8751743acff7dbf68242b8288e92edec7c
parent f220cdfca4e8e8d81daf032bd6878010ed3790f9
parent d4d542e0ca8ee116e7a5aa43cb8f5d9be50cd3cf

Merge "Fix temporary file name strlcpy size."
am: d4d542e0ca

Change-Id: Id9de2553e39a1999ed7e43c3ce5bc18b63fc2221

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
index fce5dd5..685df0f 100644
--- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
+++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
@@ -236,17 +236,15 @@
         return INSTALL_SUCCEEDED;
     }
 
-    char localTmpFileName[nativeLibPath.size() + TMP_FILE_PATTERN_LEN + 2];
+    char localTmpFileName[nativeLibPath.size() + TMP_FILE_PATTERN_LEN + 1];
     if (strlcpy(localTmpFileName, nativeLibPath.c_str(), sizeof(localTmpFileName))
             != nativeLibPath.size()) {
         ALOGD("Couldn't allocate local file name for library");
         return INSTALL_FAILED_INTERNAL_ERROR;
     }
 
-    *(localTmpFileName + nativeLibPath.size()) = '/';
-
     if (strlcpy(localTmpFileName + nativeLibPath.size(), TMP_FILE_PATTERN,
-                    TMP_FILE_PATTERN_LEN - nativeLibPath.size()) != TMP_FILE_PATTERN_LEN) {
+                    TMP_FILE_PATTERN_LEN + 1) != TMP_FILE_PATTERN_LEN) {
         ALOGI("Couldn't allocate temporary file name for library");
         return INSTALL_FAILED_INTERNAL_ERROR;
     }