RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 09:11:17 +00:00
Code Issues Projects Releases Wiki Activity

avformat/bethsoftvid: Check image dimensions before use

Browse Source 
Fixes: signed integer overflow: 55255 * 53207 cannot be represented in type 'int'
Fixes: 26387/clusterfuzz-testcase-minimized-ffmpeg_dem_AVS2_fuzzer-5684222226071552

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-10-17 22:19:58 +02:00
parent c95b47e18f
commit 50b29f081e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/bethsoftvid.c
View File

@ -28,6 +28,7 @@
*/ */
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
@ -72,6 +73,7 @@ static int vid_read_header(AVFormatContext *s)
{ {
BVID_DemuxContext *vid = s->priv_data; BVID_DemuxContext *vid = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int ret;
/* load main header. Contents: /* load main header. Contents:
* bytes: 'V' 'I' 'D' * bytes: 'V' 'I' 'D'
@ -84,6 +86,10 @@ static int vid_read_header(AVFormatContext *s)
vid->bethsoft_global_delay = avio_rl16(pb); vid->bethsoft_global_delay = avio_rl16(pb);
avio_rl16(pb); avio_rl16(pb);
ret = av_image_check_size(vid->width, vid->height, 0, s);
if (ret < 0)
return ret;
// wait until the first packet to create each stream // wait until the first packet to create each stream
vid->video_index = -1; vid->video_index = -1;
vid->audio_index = -1; vid->audio_index = -1;