diff mbox series

[FFmpeg-devel,v2] avcodec/mpegvideo_enc: Add check for av_packet_new_side_data()

Message ID BYAPR03MB4168B0805C81A1FBE5A1FBD0ADC62@BYAPR03MB4168.namprd03.prod.outlook.com
State New
Headers show
Series [FFmpeg-devel,v2] avcodec/mpegvideo_enc: Add check for av_packet_new_side_data() | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Jiasheng Jiang June 10, 2024, 2:18 p.m. UTC
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(+)

Comments

Anton Khirnov July 1, 2024, 10:59 a.m. UTC | #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.
diff mbox series

Patch

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;
         }