Browse Source

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@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.1
Martin Storsjö 12 years ago
parent
commit
9fb0de86b4
1 changed files with 1 additions and 0 deletions
  1. +1
    -0
      libavcodec/pcx.c

+ 1
- 0
libavcodec/pcx.c View File

@@ -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 */


Loading…
Cancel
Save