aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/fitsdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-06-13 00:24:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-06-30 14:41:51 +0200
commitb5d6b509b1ce6c663c30d329d939ff13bfd4e280 (patch)
tree67bd820cab6f1bfe196b5f6727370b9e479240a2 /libavcodec/fitsdec.c
parentf3bfb0717982992959ac4ecd40f4d2ddcab25eb1 (diff)
downloadffmpeg-b5d6b509b1ce6c663c30d329d939ff13bfd4e280.tar.gz
avcodec/fitsdec: Check data_min/max
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@niedermayer.cc> (cherry picked from commit eb82d19f035f59edf0aee215f02baaea908875de) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/fitsdec.c')
-rw-r--r--libavcodec/fitsdec.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/fitsdec.c b/libavcodec/fitsdec.c
index 67a8bd71f4..4f452422ef 100644
--- a/libavcodec/fitsdec.c
+++ b/libavcodec/fitsdec.c
@@ -168,6 +168,14 @@ 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 && header->data_min >= header->data_max) {
+ 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;
+ }
+ av_log(avctx, AV_LOG_WARNING, "data min/max indicates a blank image\n");
+ header->data_max ++;
+ }
return 0;
}