Merge "Parcel marshall - disallow RPC Parcels"

This commit is contained in:
Steven Moreland
2022-07-07 20:49:22 +00:00
committed by Gerrit Code Review

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",