diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-29 18:39:52 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-09-29 21:05:16 +0300 |
| commit | ff07ec143ebd3833fd5a3f4b6c00474ac523a31f (patch) | |
| tree | 5b2adc3f592abb6323390d01aafec9b7aacbfc81 /libavcodec | |
| parent | d1d99e3befea5d411ac3aae72dbdecce94f8b547 (diff) | |
| download | ffmpeg-ff07ec143ebd3833fd5a3f4b6c00474ac523a31f.tar.gz | |
pcx: Return an error on broken palette if err_detect is set to 'explode'
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pcx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index 837f268efa..05a8f7c3fb 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -171,7 +171,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (buf_size < 769) { av_log(avctx, AV_LOG_ERROR, "File is too short\n"); - ret = buf_size; + ret = avctx->err_recognition & AV_EF_EXPLODE ? + AVERROR_INVALIDDATA : buf_size; goto end; } @@ -187,7 +188,8 @@ 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; + ret = avctx->err_recognition & AV_EF_EXPLODE ? + AVERROR_INVALIDDATA : buf_size; goto end; } } else if (nplanes == 1) { /* all packed formats, max. 16 colors */ |