From 999ccd2d0a43640921088578f138c874f6cc0f8a Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Mon, 3 Jun 2013 04:00:43 +0200
Subject: tiff: cleanup the error paths

Return the proper error values and optionally report them.
---
 libavcodec/tiff.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'libavcodec/tiff.c')

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 2471f33ec6..edef8308b8 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -156,10 +156,9 @@ static int tiff_unpack_fax(TiffContext *s, uint8_t *dst, int stride,
         return AVERROR(ENOMEM);
     }
     if (s->fax_opts & 2) {
-        av_log(s->avctx, AV_LOG_ERROR,
-               "Uncompressed fax mode is not supported (yet)\n");
+        avpriv_request_sample(s->avctx, "Uncompressed fax mode");
         av_free(src2);
-        return AVERROR_INVALIDDATA;
+        return AVERROR_PATCHWELCOME;
     }
     if (!s->fill_order) {
         memcpy(src2, src, size);
@@ -437,8 +436,7 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
 #endif
         case TIFF_JPEG:
         case TIFF_NEWJPEG:
-            av_log(s->avctx, AV_LOG_ERROR,
-                   "JPEG compression is not supported\n");
+            avpriv_report_missing_feature(s->avctx, "JPEG compression");
             return AVERROR_PATCHWELCOME;
         default:
             av_log(s->avctx, AV_LOG_ERROR, "Unknown compression method %i\n",
@@ -535,7 +533,7 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
         break;
     case TIFF_PLANAR:
         if (value == 2) {
-            av_log(s->avctx, AV_LOG_ERROR, "Planar format is not supported\n");
+            avpriv_report_missing_feature(s->avctx, "Planar format");
             return AVERROR_PATCHWELCOME;
         }
         break;
@@ -548,8 +546,12 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
             s->fax_opts = value;
         break;
     default:
-        av_log(s->avctx, AV_LOG_DEBUG, "Unknown or unsupported tag %d/0X%0X\n",
-               tag, tag);
+        if (s->avctx->err_recognition & AV_EF_EXPLODE) {
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "Unknown or unsupported tag %d/0X%0X\n",
+                   tag, tag);
+            return AVERROR_INVALIDDATA;
+        }
     }
     return 0;
 }
@@ -640,9 +642,12 @@ static int decode_frame(AVCodecContext *avctx,
             av_log(avctx, AV_LOG_ERROR, "Invalid strip size/offset\n");
             return AVERROR_INVALIDDATA;
         }
-        if (tiff_unpack_strip(s, dst, stride, orig_buf + soff, ssize,
-                              FFMIN(s->rps, s->height - i)) < 0)
+        if ((ret = tiff_unpack_strip(s, dst, stride, orig_buf + soff, ssize,
+                                     FFMIN(s->rps, s->height - i))) < 0) {
+            if (avctx->err_recognition & AV_EF_EXPLODE)
+                return ret;
             break;
+        }
         dst += s->rps * stride;
     }
     if (s->predictor == 2) {
-- 
cgit v1.2.3