aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-02-02 19:28:15 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-02-20 14:21:24 +0100
commit2d155dcb7eae50a448c71af9c2324eafd47a98f5 (patch)
tree7bb554d1c0eb573cc80a78308a7214d5331e050e
parenta4bb9b5aada7d78c7169d3ce3932494e609bceb4 (diff)
downloadffmpeg-2d155dcb7eae50a448c71af9c2324eafd47a98f5.tar.gz
avcodec/fits: Check gcount and pcount being non negative
Fixes: signed integer overflow: 9223372036854775807 - -30069403896 cannot be represented in type 'long' Fixes: 30046/clusterfuzz-testcase-minimized-ffmpeg_dem_FITS_fuzzer-5807144773484544 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 c000a9128815e7cee4316dc45605259bbaa138ff) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/fits.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/fits.c b/libavcodec/fits.c
index 25c33e06c8..97fa7abe80 100644
--- a/libavcodec/fits.c
+++ b/libavcodec/fits.c
@@ -205,8 +205,12 @@ int avpriv_fits_header_parse_line(void *avcl, FITSHeader *header, const uint8_t
} else if (!strcmp(keyword, "GROUPS") && sscanf(value, "%c", &c) == 1) {
header->groups = (c == 'T');
} else if (!strcmp(keyword, "GCOUNT") && sscanf(value, "%"SCNd64"", &t) == 1) {
+ if (t < 0 || t > INT_MAX)
+ return AVERROR_INVALIDDATA;
header->gcount = t;
} else if (!strcmp(keyword, "PCOUNT") && sscanf(value, "%"SCNd64"", &t) == 1) {
+ if (t < 0 || t > INT_MAX)
+ return AVERROR_INVALIDDATA;
header->pcount = t;
}
dict_set_if_not_null(metadata, keyword, value);