Merge "Update Parcel readLazyValue to ignore negative object lengths" into tm-qpr-dev am: 1616c18830

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20111891

Change-Id: I4217009290de35449c380f6636838e5870674d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hao Ke
2022-10-05 20:36:26 +00:00
committed by Automerger Merge Worker

View File

@@ -4422,6 +4422,9 @@ public final class Parcel {
int type = readInt();
if (isLengthPrefixed(type)) {
int objectLength = readInt();
if (objectLength < 0) {
return null;
}
int end = MathUtils.addOrThrow(dataPosition(), objectLength);
int valueLength = end - start;
setDataPosition(end);