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

Merge "Parcel marshall - disallow RPC Parcels" am: 609f7a65b3 am: 9d4906616a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2148573

Change-Id: I59f9609e9c67389205875c785c1ded91848aef36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2022-07-07 21:30:40 +00:00
committed by Automerger Merge Worker
parent a74545bf02 9d4906616a
commit 40140a8113
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_os_Parcel.cpp
View File

@@ -549,6 +549,11 @@ static jbyteArray android_os_Parcel_marshall(JNIEnv* env, jclass clazz, jlong na
return NULL; return NULL;
} }
if (parcel->isForRpc()) {
jniThrowException(env, "java/lang/RuntimeException", "Tried to marshall an RPC Parcel.");
return NULL;
}
if (parcel->objectsCount()) if (parcel->objectsCount())
{ {
jniThrowException(env, "java/lang/RuntimeException", jniThrowException(env, "java/lang/RuntimeException",