[FFmpeg-cvslog] avformat/nutdec: Check tmp_size

2021-09-08 Thread Michael Niedermayer 
ffmpeg | branch: release/4.4 | Michael Niedermayer  | 
Sun Apr 25 20:01:03 2021 +0200| [acfce11c48a1d19d16b9cef798e9350e44581cd5] | 
committer: Michael Niedermayer

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 
(cherry picked from commit 1ca00b5e44f21840b608e238fa135a1aab6e576b)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acfce11c48a1d19d16b9cef798e9350e44581cd5
---

 libavformat/nutdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index fbecf71328..58a74612a4 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') {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/nutdec: Check tmp_size

2021-06-18 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sun 
Apr 25 20:01:03 2021 +0200| [1ca00b5e44f21840b608e238fa135a1aab6e576b] | 
committer: Michael Niedermayer

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 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ca00b5e44f21840b608e238fa135a1aab6e576b
---

 libavformat/nutdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index e709257135..fc5a6a1542 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') {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".