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 am: 40140a8113 am: 728f881f8d am: c481c5a1c6

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

Change-Id: I9a3f3e22ab50e68a648cafe42a47cf7bb7b7911a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2022-07-07 22:04:00 +00:00
committed by Automerger Merge Worker
parent a80bbc97a7 c481c5a1c6
commit 8cbe12af4c
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;
}
if (parcel->isForRpc()) {
jniThrowException(env, "java/lang/RuntimeException", "Tried to marshall an RPC Parcel.");
return NULL;
}
if (parcel->objectsCount())
{
jniThrowException(env, "java/lang/RuntimeException",