commit d751a4374991c86292f0f4d87b97c6c2d3e0240d
author Robert Shih <robertshih@google.com> Fri Apr 10 20:39:32 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 10 20:39:32 2020 +0000
tree 9bc0ef3651814d068d2d97d673ca138d417b571c
parent 5226677901af08551446c103bf7d15797e87756c
parent b709514956e95c55bb8015e44f86e30ee63366f5

Merge "AMPEG4ElementaryAssembler: erase malformed packets" into rvc-dev

media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp

diff --git a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
index 9df3508..76d3674 100644
--- a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
+++ b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
@@ -250,12 +250,16 @@
     } else {
         // hexdump(buffer->data(), buffer->size());
         if (buffer->size() < 2) {
+            android_errorWriteLog(0x534e4554, "124783982");
+            queue->erase(queue->begin());
             return MALFORMED_PACKET;
         }
 
         unsigned AU_headers_length = U16_AT(buffer->data());  // in bits
 
         if (buffer->size() < 2 + (AU_headers_length + 7) / 8) {
+            android_errorWriteLog(0x534e4554, "124783982");
+            queue->erase(queue->begin());
             return MALFORMED_PACKET;
         }
 
@@ -359,6 +363,8 @@
                 return MALFORMED_PACKET;
             }
             if (buffer->size() < offset + header.mSize) {
+                android_errorWriteLog(0x534e4554, "124783982");
+                queue->erase(queue->begin());
                 return MALFORMED_PACKET;
             }