[PATCH v2] 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> --- Changelog: v1 -> v2: Wrap lines in the body of the commit message. --- libavcodec/mpegvideo_enc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 82bab43e14..9b4a516bc0 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1786,6 +1786,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.25.1
Quoting Jiasheng Jiang (2024-06-10 16:18:11)
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> --- Changelog:
v1 -> v2: Wrap lines in the body of the commit message. --- libavcodec/mpegvideo_enc.c | 2 ++ 1 file changed, 2 insertions(+)
Looks ok, will push soonish. -- Anton Khirnov
participants (2)
-
Anton Khirnov -
Jiasheng Jiang