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

Avoid interface name copy in HwParcel

Browse Source 
Test: builds
Change-Id: I9ad7403707aac6af8b5f68375527dd8250c2c8fc
This commit is contained in:
Daniel Colascione
2020-02-24 03:38:40 -08:00
parent bcd771bd08
commit 74c60fbacc
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android_os_HwParcel.cpp
View File

@@ -292,19 +292,11 @@ static void JHwParcel_native_enforceInterface(
return;
}
const jchar *interfaceName = env->GetStringCritical(interfaceNameObj, NULL);
const char *interfaceName = env->GetStringUTFChars(interfaceNameObj, NULL);
if (interfaceName) {
String8 interfaceNameCopy = String8(String16(
reinterpret_cast<const char16_t *>(interfaceName),
env->GetStringLength(interfaceNameObj)));
env->ReleaseStringCritical(interfaceNameObj, interfaceName);
interfaceName = NULL;
hardware::Parcel *parcel =
JHwParcel::GetNativeContext(env, thiz)->getParcel();
bool valid = parcel->enforceInterface(interfaceNameCopy.string());
bool valid = parcel->enforceInterface(interfaceName);
if (!valid) {
jniThrowException(
@@ -312,6 +304,7 @@ static void JHwParcel_native_enforceInterface(
"java/lang/SecurityException",
"HWBinder invocation to an incorrect interface");
}
env->ReleaseStringUTFChars(interfaceNameObj, interfaceName);
}
}