virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avcodec/bintext: sanity check dimensions

Browse Source 
Fixes: Timeout
Fixes: 6277/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XBIN_fuzzer-6047202288861184

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 090c0abff9c8b27304614f15d9464dbf4ea59833)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-02-26 21:17:08 +01:00
parent bafb13dc0f
commit 5909508e8d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/bintext.c
View File

@ -35,6 +35,8 @@
#include "bintext.h" #include "bintext.h"
#include "internal.h" #include "internal.h"
#define FONT_WIDTH 8
typedef struct XbinContext { typedef struct XbinContext {
AVFrame *frame; AVFrame *frame;
int palette[16]; int palette[16];
@ -91,6 +93,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
break; break;
} }
} }
if (avctx->width < FONT_WIDTH || avctx->height < s->font_height)
return AVERROR_INVALIDDATA;
s->frame = av_frame_alloc(); s->frame = av_frame_alloc();
if (!s->frame) if (!s->frame)
@ -113,8 +118,6 @@ av_unused static void hscroll(AVCodecContext *avctx)
} }
} }
#define FONT_WIDTH 8
/** /**
* Draw character to screen * Draw character to screen
*/ */