fix some crashes on negative nalsize.

Originally committed as revision 5022 to svn://svn.ffmpeg.org/ffmpeg/trunk
19 years ago · 8b03135958
parent 214c5f26c9
commit 8b03135958
1 changed files with 9 additions and 0 deletions
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@ -7507,6 +7507,15 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
        nalsize = 0;
        for(i = 0; i < h->nal_length_size; i++)
            nalsize = (nalsize << 8) | buf[buf_index++];
+        if(nalsize <= 1){
+            if(nalsize == 1){
+                buf_index++;
+                continue;
+            }else{
+                av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
+                break;
+            }
+        }
      } else {
        // start code prefix search
        for(; buf_index + 3 < buf_size; buf_index++){