diff mbox series

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

Message ID 20210720202942.8574-4-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/4] tools/target_dec_fuzzer: Adjust the threshold for VP3
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate fail Make fate failed
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate warning Make fate failed

Commit Message

Michael Niedermayer July 20, 2021, 8:29 p.m. UTC
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@niedermayer.cc>
---
 libavcodec/targa.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

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;