summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-09-18 14:47:25 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-10-09 22:15:51 +0200
commite474173f47756f392a47d8d647cb4be398228a25 (patch)
treeff07b5ba315cd2e0fbc746cffe72a734f4960eef
parent167c0dcfdcb7b55a85ae6aa04ae1636622d798b3 (diff)
downloadffmpeg-e474173f47756f392a47d8d647cb4be398228a25.tar.gz
avformat/nutdec: Check fields
Fixes: signed integer overflow: -2147483648 - 1 cannot be represented in type 'int' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_NUT_fuzzer-6566001610719232 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 2c146406eac06f3d3cd3d981c29e7affd834cb4d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/nutdec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 0b04aaad3e..7bde16be9c 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -244,6 +244,11 @@ static int decode_main_header(NUTContext *nut)
for (i = 0; i < 256;) {
int tmp_flags = ffio_read_varlen(bc);
int tmp_fields = ffio_read_varlen(bc);
+ if (tmp_fields < 0) {
+ av_log(s, AV_LOG_ERROR, "fields %d is invalid\n", tmp_fields);
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
if (tmp_fields > 0)
tmp_pts = get_s(bc);