[FFmpeg-cvslog] pcx: Return an error on broken palette if err_detect is set to 'explode'

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Sep 29 18:39:52 2013 +0300| [ff07ec143ebd3833fd5a3f4b6c00474ac523a31f] | committer: Martin Storsjö

pcx: Return an error on broken palette if err_detect is set to 'explode'

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff07ec143ebd3833fd5a3f4b6c00474ac523a31f
---

 libavcodec/pcx.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index 837f268..05a8f7c 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 */