[automerger] m4v_h263: add a test for invalid/negative value am: 7802c68aeb am: 08aa2367b5

Change-Id: Ie1301b5ec3749d8bb09f5a48137402364c81d102
5 years ago · 644ad716f0
parent 30d710f5af 08aa2367b5
commit 644ad716f0
1 changed files with 5 additions and 1 deletions
--- a/media/libstagefright/codecs/m4v_h263/dec/src/packet_util.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/packet_util.cpp
@ -52,7 +52,11 @@ PV_STATUS PV_ReadVideoPacketHeader(VideoDecData *video, int *next_MB)
        PV_BitstreamByteAlign(stream);
        BitstreamReadBits32(stream, resync_marker_length);

-        *next_MB = (int) BitstreamReadBits16(stream, nbits);
+        int mbnum = (int) BitstreamReadBits16(stream, nbits);
+        if (mbnum < 0) {
+            return PV_FAIL;
+        }
+        *next_MB = mbnum;
 //      if (*next_MB <= video->mbnum)   /*  needs more investigation */
 //          *next_MB = video->mbnum+1;