Commit 090c0abf authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/bintext: sanity check dimensions

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/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 27cbbbb3
...@@ -35,6 +35,8 @@ ...@@ -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) ...@@ -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) ...@@ -113,8 +118,6 @@ av_unused static void hscroll(AVCodecContext *avctx)
} }
} }
#define FONT_WIDTH 8
/** /**
* Draw character to screen * Draw character to screen
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment