From 5d8e4f6da03c0342157e6ac7fab1a8ac3a87a8b0 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 13 Dec 2013 01:33:35 +0100
Subject: [PATCH] avformat/rtpenc: check av_packet_get_side_data() return, fix
null ptr dereference
Fixes CID1035715
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavformat/rtpenc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 6fdc908d0f9..f0100083b87 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -557,6 +557,10 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
const uint8_t *mb_info =
av_packet_get_side_data(pkt, AV_PKT_DATA_H263_MB_INFO,
&mb_info_size);
+ if (!mb_info) {
+ av_log(s1, AV_LOG_ERROR, "failed to allocate side data\n");
+ return AVERROR(ENOMEM);
+ }
ff_rtp_send_h263_rfc2190(s1, pkt->data, size, mb_info, mb_info_size);
break;
}
--
GitLab