diff options
| -rw-r--r-- | core/jni/android_util_jar_StrictJarFile.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/jni/android_util_jar_StrictJarFile.cpp b/core/jni/android_util_jar_StrictJarFile.cpp index e33da9167e05..57688c456738 100644 --- a/core/jni/android_util_jar_StrictJarFile.cpp +++ b/core/jni/android_util_jar_StrictJarFile.cpp @@ -112,7 +112,7 @@ jlong StrictJarFile_nativeStartIteration(JNIEnv* env, jobject, jlong nativeHandl jobject StrictJarFile_nativeNextEntry(JNIEnv* env, jobject, jlong iterationHandle) { ZipEntry data; - ZipString entryName; + std::string entryName; IterationHandle* handle = reinterpret_cast<IterationHandle*>(iterationHandle); const int32_t error = Next(*handle->CookieAddress(), &data, &entryName); @@ -121,10 +121,7 @@ jobject StrictJarFile_nativeNextEntry(JNIEnv* env, jobject, jlong iterationHandl return NULL; } - std::unique_ptr<char[]> entryNameCString(new char[entryName.name_length + 1]); - memcpy(entryNameCString.get(), entryName.name, entryName.name_length); - entryNameCString[entryName.name_length] = '\0'; - ScopedLocalRef<jstring> entryNameString(env, env->NewStringUTF(entryNameCString.get())); + ScopedLocalRef<jstring> entryNameString(env, env->NewStringUTF(entryName.c_str())); return newZipEntry(env, data, entryNameString.get()); } |