[FFmpeg-devel] [PATCH 4/4] avcodec/fitsdec: Check data_min/max

Michael Niedermayer michael at niedermayer.cc
Thu Jun 13 02:20:20 EEST 2019


Fixes: division by 0
Fixes: 15206/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FITS_fuzzer-5657260212092928

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/fitsdec.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libavcodec/fitsdec.c b/libavcodec/fitsdec.c
index b0753813c9..2da79e1ef9 100644
--- a/libavcodec/fitsdec.c
+++ b/libavcodec/fitsdec.c
@@ -168,6 +168,16 @@ static int fits_read_header(AVCodecContext *avctx, const uint8_t **ptr, FITSHead
         header->data_min = (header->data_min - header->bzero) / header->bscale;
         header->data_max = (header->data_max - header->bzero) / header->bscale;
     }
+    if (!header->rgb) {
+        if (header->data_min > header->data_max) {
+            av_log(avctx, AV_LOG_ERROR, "data min/max (%g %g) is invalid\n", header->data_min, header->data_max);
+            return AVERROR_INVALIDDATA;
+        }
+        if (header->data_min == header->data_max) {
+            av_log(avctx, AV_LOG_WARNING, "data min/max indicates a blank image\n");
+            header->data_max ++;
+        }
+    }
 
     return 0;
 }
-- 
2.21.0



More information about the ffmpeg-devel mailing list