commit 4d1130a93fc7526c396c1b54da11bb2d16d5858a
author Santiago Seifert <aquilescanta@google.com> Wed Dec 08 11:53:34 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 08 11:53:34 2021 +0000
tree 7ba94f0f3e92fcf4a402de1354851d08c5006c88
parent 8bfe498016afc791a66f49ab1bf6068a119c8e7a
parent cc538ed26803328445d52383f91025b357cda47d

Merge "Prevent out-of-bounds read" into sc-dev

media/libstagefright/rtsp/AAVCAssembler.cpp

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) {