commit 5be284fc4a827d24804c6d56b0803f129a44163b
author Marco Nelissen <marcone@google.com> Thu Nov 12 15:41:50 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 12 15:41:50 2015 +0000
tree a5c86864b5b611e4a941d309651a8304963a6b4b
parent 7e150264857034bd308fdb791e0de0d618f3e231
parent 6e9e6336e8c7fb3277ff1f1bd880cd74bececef9

Merge "Handle malformed audio packets received during RTSP stream switching"
am: 6e9e6336e8

* commit '6e9e6336e8c7fb3277ff1f1bd880cd74bececef9':
  Handle malformed audio packets received during RTSP stream switching

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
index a1a6576..82a0631 100644
--- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
+++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
@@ -379,7 +379,10 @@
                 unsigned muxSlotLengthBytes = 0;
                 unsigned tmp;
                 do {
-                    CHECK_LT(offset, buffer->size());
+                    if (offset >= buffer->size()) {
+                        ALOGW("Malformed buffer received");
+                        return out;
+                    }
                     tmp = ptr[offset++];
                     muxSlotLengthBytes += tmp;
                 } while (tmp == 0xff);