diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-29 14:07:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-05 23:16:54 +0200 |
| commit | 8d1cd5fa08dde7cc825782f33708c115877ec3f5 (patch) | |
| tree | 29e3c92c6e38b176d6e0ddf92aac818d37acc599 | |
| parent | 20b9b1fd77d49c2a6ff7fd8788ee44979cfca7aa (diff) | |
| download | ffmpeg-8d1cd5fa08dde7cc825782f33708c115877ec3f5.tar.gz | |
avcodec/ansi: Fix frame memleak
Fixes: 1892/clusterfuzz-testcase-minimized-4519341733183488
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 e091b9b3c7859030f2896ca2ae96faa3afc694a1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ansi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 98ea9e3d2a..31405b4a99 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -80,10 +80,6 @@ static av_cold int decode_init(AVCodecContext *avctx) AnsiContext *s = avctx->priv_data; avctx->pix_fmt = AV_PIX_FMT_PAL8; - s->frame = av_frame_alloc(); - if (!s->frame) - return AVERROR(ENOMEM); - /* defaults */ s->font = avpriv_vga16_font; s->font_height = 16; @@ -98,6 +94,11 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Invalid dimensions %d %d\n", avctx->width, avctx->height); return AVERROR(EINVAL); } + + s->frame = av_frame_alloc(); + if (!s->frame) + return AVERROR(ENOMEM); + return 0; } |