Skip to content

Commit

Permalink
avcodec/vp3: Add missing check for av_malloc
Browse files Browse the repository at this point in the history
Since the av_malloc() may fail and return NULL pointer,
it is needed that the 's->edge_emu_buffer' should be checked
whether the new allocation is success.

Fixes: d147238 ("VP3: fix decoding of videos with stride > 2048")
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
(cherry picked from commit 656cb04)
  • Loading branch information
JiangJias authored and jamrial committed Dec 18, 2022
1 parent a8a208b commit 51efa68
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion libavcodec/vp3.c
Expand Up @@ -2136,8 +2136,13 @@ static int vp3_decode_frame(AVCodecContext *avctx,
if (ff_thread_get_buffer(avctx, &s->current_frame, AV_GET_BUFFER_FLAG_REF) < 0)
goto error;

if (!s->edge_emu_buffer)
if (!s->edge_emu_buffer) {
s->edge_emu_buffer = av_malloc(9 * FFABS(s->current_frame.f->linesize[0]));
if (!s->edge_emu_buffer) {
ret = AVERROR(ENOMEM);
goto error;
}
}

if (s->keyframe) {
if (!s->theora) {
Expand Down

0 comments on commit 51efa68

Please sign in to comment.