| commit | d8ca2131d988b7c0f3c1269eb5100293be41557f | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Wed Dec 08 12:39:38 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 08 12:39:38 2021 +0000 |
| tree | 84515231c4745a5ddad7ebd66c2509ba56cefc73 | |
| parent | 34ec3c0772e002b0842bc263ca137b36873ed4f9 [diff] | |
| parent | b50bdd801c01bf5c60595c677aa7de05f1e1557c [diff] |
Merge "Prevent out-of-bounds read" into sc-dev am: 4d1130a93f am: f3c5806f9f am: b50bdd801c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/16304601 Change-Id: Idd204d5e6fddd988672d473f4fc2150133888f1e
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) {