[FFmpeg-cvslog] pcx: Consume the whole packet if giving up due to missing palette
Martin Storsjö
git at videolan.org
Mon Sep 30 01:05:25 CEST 2013
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Sep 29 00:38:50 2013 +0300| [9fb0de86b49e9fb0709a8ad1e1875e35da841887] | committer: Martin Storsjö
pcx: Consume the whole packet if giving up due to missing palette
Previously, we returned 0, meaning successful decoding but 0
bytes consumed, leading to an infinite loop.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fb0de86b49e9fb0709a8ad1e1875e35da841887
---
libavcodec/pcx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index a6f9d8d..fd8bb2a 100644
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -181,6 +181,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
}
if (*buf++ != 12) {
av_log(avctx, AV_LOG_ERROR, "expected palette after image data\n");
+ ret = buf_size;
goto end;
}
} else if (nplanes == 1) { /* all packed formats, max. 16 colors */
More information about the ffmpeg-cvslog
mailing list