OSDN Git Service

interplayvideo: Free previous frames on resolution changes.
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jan 2013 23:45:24 +0000 (00:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jan 2013 23:46:04 +0000 (00:46 +0100)
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/interplayvideo.c

index 3285578..e0550a7 100644 (file)
@@ -969,6 +969,13 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
     if (buf_size < s->decoding_map_size)
         return buf_size;
 
+    if (s->last_frame.data[0] && av_packet_get_side_data(avpkt, AV_PKT_DATA_PARAM_CHANGE, NULL)) {
+        if (s->last_frame.data[0])
+            avctx->release_buffer(avctx, &s->last_frame);
+        if (s->second_last_frame.data[0])
+            avctx->release_buffer(avctx, &s->second_last_frame);
+    }
+
     s->decoding_map = buf;
     bytestream2_init(&s->stream_ptr, buf + s->decoding_map_size,
                      buf_size - s->decoding_map_size);