Message ID | 20180715131341.28705-5-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | d134b8d85f5e8d1b0778d62455c2e80d5b2e8d66 |
Headers | show |
On Sun, Jul 15, 2018 at 03:13:41PM +0200, Michael Niedermayer wrote: > frame_number will not increase if nothing is output > > Fixes: Timeout > Fixes: 9057/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDGRAPHICS_fuzzer-4844661498707968 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/cdgraphics.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) will apply [...]
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 87ad5e79f4..be85e54288 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -69,6 +69,7 @@ typedef struct CDGraphicsContext { int hscroll; int vscroll; int transparency; + int cleared; } CDGraphicsContext; static av_cold int cdg_decode_init(AVCodecContext *avctx) @@ -287,9 +288,10 @@ static int cdg_decode_frame(AVCodecContext *avctx, if ((ret = ff_reget_buffer(avctx, cc->frame)) < 0) return ret; - if (!avctx->frame_number) { + if (!cc->cleared) { memset(cc->frame->data[0], 0, cc->frame->linesize[0] * avctx->height); memset(cc->frame->data[1], 0, AVPALETTE_SIZE); + cc->cleared = 1; } command = bytestream2_get_byte(&gb);
frame_number will not increase if nothing is output Fixes: Timeout Fixes: 9057/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDGRAPHICS_fuzzer-4844661498707968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/cdgraphics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)