[FFmpeg-cvslog] avformat/hls: Handle read_buffer allocation failure

Michael Niedermayer git at videolan.org
Tue May 12 19:39:54 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 12 19:03:18 2015 +0200| [7a27aa15ec940f315f5446875db3757191f01a26] | committer: Michael Niedermayer

avformat/hls: Handle read_buffer allocation failure

Fixes CID1297576

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

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

 libavformat/hls.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 451b78e..3f1d97e 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1340,6 +1340,12 @@ static int hls_read_header(AVFormatContext *s)
         pls->cur_seq_no = select_cur_seq_no(c, pls);
 
         pls->read_buffer = av_malloc(INITIAL_BUFFER_SIZE);
+        if (!pls->read_buffer){
+            ret = AVERROR(ENOMEM);
+            avformat_free_context(pls->ctx);
+            pls->ctx = NULL;
+            goto fail;
+        }
         ffio_init_context(&pls->pb, pls->read_buffer, INITIAL_BUFFER_SIZE, 0, pls,
                           read_data, NULL, NULL);
         pls->pb.seekable = 0;



More information about the ffmpeg-cvslog mailing list