diff mbox series

[FFmpeg-devel,4/7] avcodec/fits: Check gcount and pcount being non negative

Message ID 20210202231334.24412-4-michael@niedermayer.cc
State Accepted
Commit c000a9128815e7cee4316dc45605259bbaa138ff
Headers show
Series [FFmpeg-devel,1/7] avformat/utils: Extend overflow check in dts wrap in compute_pkt_fields() | expand

Checks

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

Commit Message

Michael Niedermayer Feb. 2, 2021, 11:13 p.m. UTC 
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>
---
 libavcodec/fits.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer Feb. 13, 2021, 8:39 p.m. UTC | #1 
On Wed, Feb 03, 2021 at 12:13:31AM +0100, Michael Niedermayer wrote:
> 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>
> ---
>  libavcodec/fits.c | 4 ++++
>  1 file changed, 4 insertions(+)

will apply

[...]
diff mbox series

Patch

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);