mirror of
https://git.yoctoproject.org/poky
synced 2026-03-17 04:39:40 +01:00
d95be1c7ed
* the last patch added in: https://git.openembedded.org/openembedded-core/commit/?h=kirkstone&id=874b72fe259cd3a23f4613fccfe2e9cc3f79cd6a doesn't apply cleanly. * fixes: ERROR: ffmpeg-5.0.1-r0 do_patch: Fuzz detected: Applying patch 0001-avcodec-vp3-Add-missing-check-for-av_malloc.patch patching file libavcodec/vp3.c Hunk #1 succeeded at 2677 with fuzz 1 (offset -2 lines). (From OE-Core rev: 6060dec1fc9d215f6b2ff9d6571bac802ac6a09b) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From ef748a8bd8720416b673e1743e5673a801e8279f Mon Sep 17 00:00:00 2001
|
|
From: Jiasheng Jiang <jiasheng@iscas.ac.cn>
|
|
Date: Tue, 15 Feb 2022 17:58:08 +0800
|
|
Subject: [PATCH] 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>
|
|
|
|
CVE: CVE-2022-3109
|
|
|
|
Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/656cb0450aeb73b25d7d26980af342b37ac4c568]
|
|
|
|
Signed-off-by: Narpat Mali <narpat.mali@windriver.com>
|
|
|
|
---
|
|
libavcodec/vp3.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
|
|
index 5b9ba60..f1eccfe 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) {
|