[FFmpeg-cvslog] avformat/rtsp: Fix null pointer dereference

Himangi Saraogi git at videolan.org
Sat Apr 4 13:47:23 CEST 2015


ffmpeg | branch: master | Himangi Saraogi <himangi774 at gmail.com> | Sat Apr  4 16:39:40 2015 +0530| [4b030025278ac4adc3616510f36de4c7a113c5fb] | committer: Michael Niedermayer

avformat/rtsp: Fix null pointer dereference

This fixes CID 1257827.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/rtsp.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 68ef36e..c9871ce 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -2259,6 +2259,8 @@ static int sdp_read_header(AVFormatContext *s)
     /* read the whole sdp file */
     /* XXX: better loading */
     content = av_malloc(SDP_MAX_SIZE);
+    if (!content)
+        return AVERROR(ENOMEM);
     size = avio_read(s->pb, content, SDP_MAX_SIZE - 1);
     if (size <= 0) {
         av_free(content);



More information about the ffmpeg-cvslog mailing list