[FFmpeg-devel] [PATCH] avcodec/msvideo1enc: Add check for av_malloc

[FFmpeg-devel] [PATCH] avcodec/msvideo1enc: Add check for av_malloc

[Jiasheng Jiang]

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)
-- 
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".

Re: [FFmpeg-devel] [PATCH] avcodec/msvideo1enc: Add check for av_malloc

[James Almer]

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".