| commit | c60a9f170da6714a9da5747a4cd138dcbb00e26d | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Wed Dec 08 12:11:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 08 12:11:57 2021 +0000 |
| tree | 8dbd186bad5604975f32915b22b0708aa64bbda6 | |
| parent | 9cea58196c04c8e7eeb6d7e946bb07727d8a7540 [diff] | |
| parent | 4d1130a93fc7526c396c1b54da11bb2d16d5858a [diff] |
Merge "Prevent out-of-bounds read" into sc-dev am: 4d1130a93f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/16304601 Change-Id: I62413f9124c093bbd660ca5f6709ec1904949dac
diff --git a/media/libstagefright/rtsp/AAVCAssembler.cpp b/media/libstagefright/rtsp/AAVCAssembler.cpp index 3f4d662..30cdbc9 100644 --- a/media/libstagefright/rtsp/AAVCAssembler.cpp +++ b/media/libstagefright/rtsp/AAVCAssembler.cpp
@@ -295,6 +295,10 @@ } void AAVCAssembler::checkSpsUpdated(const sp<ABuffer> &buffer) { + if (buffer->size() == 0) { + android_errorWriteLog(0x534e4554, "204077881"); + return; + } const uint8_t *data = buffer->data(); unsigned nalType = data[0] & 0x1f; if (nalType == 0x7) {