From b760609cb77fb2145ff8f16627d929ac190a480e Mon Sep 17 00:00:00 2001 From: James Stembridge Date: Fri, 25 Apr 2003 17:31:31 +0000 Subject: prevent avcodec_flush_buffers from corrupting memory when decoding mjpeg CVS patchset: 4676 CVS date: 2003/04/25 17:31:31 --- src/libffmpeg/libavcodec/utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/libffmpeg/libavcodec/utils.c b/src/libffmpeg/libavcodec/utils.c index 5e1fbee17..8face129f 100644 --- a/src/libffmpeg/libavcodec/utils.c +++ b/src/libffmpeg/libavcodec/utils.c @@ -565,11 +565,13 @@ void avcodec_flush_buffers(AVCodecContext *avctx) MpegEncContext *s = avctx->priv_data; switch(avctx->codec_id){ + case CODEC_ID_MJPEG: + case CODEC_ID_MJPEGB: + if(avctx->codec->priv_data_size != sizeof(MpegEncContext)) + break; case CODEC_ID_MPEG1VIDEO: case CODEC_ID_H263: case CODEC_ID_RV10: - case CODEC_ID_MJPEG: - case CODEC_ID_MJPEGB: case CODEC_ID_MPEG4: case CODEC_ID_MSMPEG4V1: case CODEC_ID_MSMPEG4V2: -- cgit v1.2.3