From: Wu Jianhua <jianhua.wu-at-intel.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Wu Jianhua <jianhua.wu@intel.com>
Subject: [FFmpeg-devel] [PATCH 5/5] avfilter/vf_blend: fix un-checked potential memory allocation failure
Date: Sun, 2 Jan 2022 22:51:42 +0800
Message-ID: <20220102145142.4083918-5-jianhua.wu@intel.com> (raw)
In-Reply-To: <20220102145142.4083918-1-jianhua.wu@intel.com>
Signed-off-by: Wu Jianhua <jianhua.wu@intel.com>
---
libavfilter/vf_blend.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index b6f3c4fed3..2d433e439f 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -279,7 +279,11 @@ static AVFrame *blend_frame(AVFilterContext *ctx, AVFrame *top_buf,
dst_buf = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!dst_buf)
return top_buf;
- av_frame_copy_props(dst_buf, top_buf);
+
+ if (av_frame_copy_props(dst_buf, top_buf) < 0) {
+ av_frame_free(&dst_buf);
+ return top_buf;
+ }
for (plane = 0; plane < s->nb_planes; plane++) {
int hsub = plane == 1 || plane == 2 ? s->hsub : 0;
--
2.25.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-01-02 14:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-02 14:51 [FFmpeg-devel] [PATCH 1/5] avutil/hwcontext_vulkan: fixed validation error VUID 01387 Wu Jianhua
2022-01-02 14:51 ` [FFmpeg-devel] [PATCH 2/5] transpose_vulkan: add passthrough option Wu Jianhua
2022-01-10 14:19 ` Anton Khirnov
2022-01-10 15:52 ` Wu Jianhua
2022-01-02 14:51 ` [FFmpeg-devel] [PATCH 3/5] avfilter/vf_scale_vulkan: align struct ScaleVulkanContext Wu Jianhua
2022-01-02 14:51 ` [FFmpeg-devel] [PATCH 4/5] avfilter: add a blend_vulkan filter Wu Jianhua
2022-01-02 14:51 ` Wu Jianhua [this message]
2022-01-03 2:23 ` [FFmpeg-devel] [PATCH 5/5] avfilter/vf_blend: fix un-checked potential memory allocation failure Lynne
2022-01-03 8:39 ` Wu, Jianhua
2022-01-03 13:57 ` Timo Rothenpieler
2022-01-03 14:48 ` Wu Jianhua
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220102145142.4083918-5-jianhua.wu@intel.com \
--to=jianhua.wu-at-intel.com@ffmpeg.org \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=jianhua.wu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git