summaryrefslogtreecommitdiff
path: root/libavcodec/pcx.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/pcx.c')
-rw-r--r--libavcodec/pcx.c6
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 */