summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2021-04-25 20:01:03 +0200
committerMichael Niedermayer <[email protected]>2021-09-11 21:23:49 +0200
commit5ae0f402debdb3e3d9e0e1e01d93bff0b877ca98 (patch)
treef69db8fd2527a4c8e38083204f1c72c179e9c9cf
parent159ec5a6abcd6dc39683e1a9f540e4e40f2d4f8f (diff)
avformat/nutdec: Check tmp_size
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_NUT_fuzzer-6739990530883584 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 1ca00b5e44f21840b608e238fa135a1aab6e576b) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavformat/nutdec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index e14d118bb8..e86d8222d0 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -286,6 +286,11 @@ static int decode_main_header(NUTContext *nut)
ret = AVERROR_INVALIDDATA;
goto fail;
}
+ if (tmp_size < 0 || tmp_size > INT_MAX - count) {
+ av_log(s, AV_LOG_ERROR, "illegal size\n");
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
for (j = 0; j < count; j++, i++) {
if (i == 'N') {