drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SERAPHIC][TIAF] StreamEventResponse with null data parameter will cause a null-pointer crash.

Browse Source 
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Bug: 224877495
Change-Id: Iab7547f27bb2e2340e42ead981877d3a52055ad4
This commit is contained in:
Yixiao Luo 2022-03-21 19:13:56 -07:00
parent a725962d69
commit a92a92fc62
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
media/java/android/media/tv/StreamEventResponse.java
View File

@ -63,8 +63,12 @@ public final class StreamEventResponse extends BroadcastInfoResponse implements
mEventId = source.readInt();
mNptMillis = source.readLong();
int dataLength = source.readInt();
mData = new byte[dataLength];
source.readByteArray(mData);
if (dataLength > 0) {
mData = new byte[dataLength];
source.readByteArray(mData);
} else {
mData = null;
}
}
/**
@ -100,7 +104,11 @@ public final class StreamEventResponse extends BroadcastInfoResponse implements
super.writeToParcel(dest, flags);
dest.writeInt(mEventId);
dest.writeLong(mNptMillis);
dest.writeInt(mData.length);
dest.writeByteArray(mData);
if (mData != null && mData.length > 0) {
dest.writeInt(mData.length);
dest.writeByteArray(mData);
} else {
dest.writeInt(0);
}
}
}