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

Jiasheng Jiang git at videolan.org
Mon Apr 17 05:37:42 EEST 2023


ffmpeg | branch: master | Jiasheng Jiang <jiasheng at iscas.ac.cn> | Mon Apr 17 10:32:51 2023 +0800| [b9ba036680b4164f6e415a85877dfa659ae4dde1] | committer: James Almer

avcodec/msvideo1enc: Add check for av_malloc

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 at iscas.ac.cn>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9ba036680b4164f6e415a85877dfa659ae4dde1
---

 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)



More information about the ffmpeg-cvslog mailing list