aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiasheng Jiang <jiasheng@iscas.ac.cn>2022-02-15 17:58:08 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2023-03-27 13:37:24 +0200
commit2cdddcd6ec90c7a248ffe792d85faa4d89eab9f7 (patch)
tree9bc572c0bdb0921eb75e6de8a8b869430b2c88ec
parent9097001f8012b4af57ac2e8076159ee9c7054b54 (diff)
downloadffmpeg-2cdddcd6ec90c7a248ffe792d85faa4d89eab9f7.tar.gz
avcodec/vp3: Add missing check for av_malloc
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: d14723861b ("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 656cb0450aeb73b25d7d26980af342b37ac4c568) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/vp3.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 5b9ba60f49..f1eccfe1af 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2677,8 +2677,13 @@ static int vp3_decode_frame(AVCodecContext *avctx,
if ((ret = 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) {