Merge commit 'a4fec9a7eab842ea5eea1b1ee98624356cb31422'
authorClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 14:34:51 +0000 (16:34 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 14:36:13 +0000 (16:36 +0200)
* commit 'a4fec9a7eab842ea5eea1b1ee98624356cb31422':
  rtmppkt: Check for packet size mismatches

See 7d57ca4d9a75562fa32e40766211de150f8b3ee7

Merged-by: Clément Bœsch <u@pkh.me>
libavformat/rtmppkt.c

index cde0da7..833a3db 100644 (file)
@@ -236,11 +236,11 @@ static int rtmp_packet_read_one_chunk(URLContext *h, RTMPPacket *p,
         timestamp += prev_pkt[channel_id].timestamp;
 
     if (prev_pkt[channel_id].read && size != prev_pkt[channel_id].size) {
-        av_log(NULL, AV_LOG_ERROR, "RTMP packet size mismatch %d != %d\n",
-                size,
-                prev_pkt[channel_id].size);
+        av_log(h, AV_LOG_ERROR, "RTMP packet size mismatch %d != %d\n",
+                                size, prev_pkt[channel_id].size);
         ff_rtmp_packet_destroy(&prev_pkt[channel_id]);
         prev_pkt[channel_id].read = 0;
+        return AVERROR_INVALIDDATA;
     }
 
     if (!prev_pkt[channel_id].read) {