Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StrictJarFile can use the new std::string libziparchive Next overload.

Browse Source 
Bug: http://b/129068177
Test: treehugger
Change-Id: I44e89f0767723de7fce46dae58f2156fcd9a6362
This commit is contained in:
Elliott Hughes
2019-05-23 13:19:23 -07:00
parent 41537638f0
commit ace3371ef5
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_util_jar_StrictJarFile.cpp
View File

@@ -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());
}