forked from jengelh/ffmpeg-4
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
From 4065ff69a2ed49872f8694a03d0642b18c9d977c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jiasheng Jiang <jiashengjiangcool@outlook.com>
|
||
|
|
Date: Mon, 10 Jun 2024 14:18:11 +0000
|
||
|
|
Subject: [PATCH] avcodec/mpegvideo_enc: Add check for
|
||
|
|
av_packet_new_side_data()
|
||
|
|
|
||
|
|
Add check for av_packet_new_side_data() to avoid null pointer
|
||
|
|
dereference if allocation fails.
|
||
|
|
|
||
|
|
Fixes: bdc1220eeb ("h263enc: Add an option for outputting info about MBs as side data")
|
||
|
|
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@outlook.com>
|
||
|
|
Signed-off-by: Anton Khirnov <anton@khirnov.net>
|
||
|
|
---
|
||
|
|
libavcodec/mpegvideo_enc.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
|
||
|
|
index 620ca08869..d33754d115 100644
|
||
|
|
--- a/libavcodec/mpegvideo_enc.c
|
||
|
|
+++ b/libavcodec/mpegvideo_enc.c
|
||
|
|
@@ -1825,6 +1825,8 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
|
||
|
|
s->mb_info_ptr = av_packet_new_side_data(pkt,
|
||
|
|
AV_PKT_DATA_H263_MB_INFO,
|
||
|
|
s->mb_width*s->mb_height*12);
|
||
|
|
+ if (!s->mb_info_ptr)
|
||
|
|
+ return AVERROR(ENOMEM);
|
||
|
|
s->prev_mb_info = s->last_mb_info = s->mb_info_size = 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.44.0
|
||
|
|
|