| commit | 3837cf62e4aac6405f6b0d083bebe2bfb5b81930 | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Wed Dec 08 12:28:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 08 12:28:47 2021 +0000 |
| tree | 3d2c5caec551fb77ee612efd22559f8dd14a38e0 | |
| parent | 66914895a44c7058b16e22f048ded96512b74634 [diff] | |
| parent | f3c5806f9ff0ecdfa72b4f3ea1246cdd14d6a19b [diff] |
Merge "Prevent out-of-bounds read" into sc-dev am: 4d1130a93f am: f3c5806f9f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/16304601 Change-Id: Ib01729da70d7c1856bd9cc42adf4057643eee566
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) {