Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 23:04:33 +0000 (01:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 23:04:33 +0000 (01:04 +0200)
* qatar/master:
  smacker: check frame size validity

Conflicts:
libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/smacker.c

@@@ -310,8 -308,10 +310,10 @@@ static int smacker_read_packet(AVFormat
                  uint8_t *tmpbuf;
  
                  size = avio_rl32(s->pb) - 4;
-                 if(size + 4L > frame_size)
 -                if (!size || size > frame_size) {
++                if (!size || size + 4L > frame_size) {
+                     av_log(s, AV_LOG_ERROR, "Invalid audio part size\n");
                      return AVERROR_INVALIDDATA;
+                 }
                  frame_size -= size;
                  frame_size -= 4;
                  smk->curstream++;