Merge "Parcel marshall - disallow RPC Parcels"

2022-07-07 20:49:22 +00:00
parent ccc3f24699 aa7b525204
commit 609f7a65b3
1 changed files with 5 additions and 0 deletions
--- a/core/jni/android_os_Parcel.cpp
+++ b/core/jni/android_os_Parcel.cpp
@@ -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",