Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a92a92fc authored by Yixiao Luo's avatar Yixiao Luo
Browse files

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

Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Bug: 224877495
Change-Id: Iab7547f27bb2e2340e42ead981877d3a52055ad4
parent a725962d
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -63,8 +63,12 @@ public final class StreamEventResponse extends BroadcastInfoResponse implements
        mEventId = source.readInt();
        mNptMillis = source.readLong();
        int dataLength = source.readInt();
        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);
        if (mData != null && mData.length > 0) {
            dest.writeInt(mData.length);
            dest.writeByteArray(mData);
        } else {
            dest.writeInt(0);
        }
    }
}