From 9fb0de86b49e9fb0709a8ad1e1875e35da841887 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sun, 29 Sep 2013 00:38:50 +0300 Subject: pcx: Consume the whole packet if giving up due to missing palette MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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@libav.org Signed-off-by: Martin Storsjö --- libavcodec/pcx.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libavcodec/pcx.c') diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index a6f9d8d262..fd8bb2a6cb 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 */ -- cgit v1.2.3