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

Merge "Parcel: Handle NULL return from Parcel::readInPlace."

Browse Source
This commit is contained in:
Narayan Kamath
2018-08-13 09:03:43 +00:00
committed by Gerrit Code Review
parent ff9159b1df d423f670b5
commit e6d7a51aa1
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/jni/android_os_Parcel.cpp
View File

@@ -336,8 +336,13 @@ static jbyteArray android_os_Parcel_createByteArray(JNIEnv* env, jclass clazz, j
jbyte* a2 = (jbyte*)env->GetPrimitiveArrayCritical(ret, 0); jbyte* a2 = (jbyte*)env->GetPrimitiveArrayCritical(ret, 0);
if (a2) { if (a2) {
const void* data = parcel->readInplace(len); const void* data = parcel->readInplace(len);
memcpy(a2, data, len); if (data) {
memcpy(a2, data, len);
}
env->ReleasePrimitiveArrayCritical(ret, a2, 0); env->ReleasePrimitiveArrayCritical(ret, a2, 0);
if (!data) {
ret = NULL;
}
} }
} }
} }
@@ -360,9 +365,14 @@ static jboolean android_os_Parcel_readByteArray(JNIEnv* env, jclass clazz, jlong
jbyte* ar = (jbyte*)env->GetPrimitiveArrayCritical((jarray)dest, 0); jbyte* ar = (jbyte*)env->GetPrimitiveArrayCritical((jarray)dest, 0);
if (ar) { if (ar) {
const void* data = parcel->readInplace(len); const void* data = parcel->readInplace(len);
memcpy(ar, data, len); if (data) {
memcpy(ar, data, len);
ret = JNI_TRUE;
} else {
ret = JNI_FALSE;
}
env->ReleasePrimitiveArrayCritical((jarray)dest, ar, 0); env->ReleasePrimitiveArrayCritical((jarray)dest, ar, 0);
ret = JNI_TRUE;
} }
} }
return ret; return ret;