[FFmpeg-cvslog] avcodec/targa: Do not return images when there is no image in the tga

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 20 22:14:21 2021 +0200| [1e85a698c01133a7f8d35502d5901e3b65fa3317] | committer: Michael Niedermayer

avcodec/targa: Do not return images when there is no image in the tga

Fixes: Timeout
Fixes: 35877/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TARGA_fuzzer-5407292819374080

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/targa.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 3502636c16..221fcc956d 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -176,6 +176,10 @@ static int decode_frame(AVCodecContext *avctx,
     if ((ret = ff_set_dimensions(avctx, w, h)) < 0)
         return ret;
 
+    if ((compr & (~TGA_RLE)) == TGA_NODATA) {
+        return avpkt->size;
+    }
+
     if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
         return ret;
     p->pict_type = AV_PICTURE_TYPE_I;
@@ -242,9 +246,6 @@ static int decode_frame(AVCodecContext *avctx,
         }
     }
 
-    if ((compr & (~TGA_RLE)) == TGA_NODATA) {
-        memset(p->data[0], 0, p->linesize[0] * h);
-    } else {
         if (compr & TGA_RLE) {
             int res = targa_decode_rle(avctx, s, dst, w, h, stride, bpp, interleave);
             if (res < 0)
@@ -289,7 +290,6 @@ static int decode_frame(AVCodecContext *avctx,
                 }
             }
         }
-    }
 
 
     *got_frame = 1;