From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avcodec/msvideo1enc: Add check for av_malloc
Date: Sun, 16 Apr 2023 23:38:32 -0300
Message-ID: <04c67a90-f7a4-eec4-dd08-2ee73a5298ed@gmail.com> (raw)
In-Reply-To: <20230417023251.46560-1-jiasheng@iscas.ac.cn>
On 4/16/2023 11:32 PM, Jiasheng Jiang wrote:
> Add the check for the return value of the av_malloc in order to avoid
> NULL pointer deference.
>
> Fixes: e4be3485af ("MS Video 1 encoder")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> libavcodec/msvideo1enc.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c
> index 36cfd39a85..1fb8be8883 100644
> --- a/libavcodec/msvideo1enc.c
> +++ b/libavcodec/msvideo1enc.c
> @@ -84,6 +84,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
>
> if(!c->prev)
> c->prev = av_malloc(avctx->width * 3 * (avctx->height + 3));
> + if (!c->prev)
> + return AVERROR(ENOMEM);
> prevptr = c->prev + avctx->width * 3 * (FFALIGN(avctx->height, 4) - 1);
> src = (const uint16_t*)(p->data[0] + p->linesize[0]*(FFALIGN(avctx->height, 4) - 1));
> if(c->keyint >= avctx->keyint_min)
Applied, thanks.
_______________________________________________
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".
prev parent reply other threads:[~2023-04-17 2:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-17 2:32 Jiasheng Jiang
2023-04-17 2:38 ` James Almer [this message]
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=04c67a90-f7a4-eec4-dd08-2ee73a5298ed@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/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