vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen <beauz...@gmail.com> | Tue 
Jan 24 18:15:41 2012 +0100| [5ea58c91c7314d9735598bf9c20f201207855377] | 
committer: Jean-Baptiste Kempf

hls: Don't crash if a segment can't be found.

Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>
(cherry picked from commit 924a3408fd214f6d97ac829ff8ae6cde8e6a38bb)

Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=5ea58c91c7314d9735598bf9c20f201207855377
---

 modules/stream_filter/httplive.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index e2a8834..f573404 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1196,6 +1196,8 @@ static int hls_ManageSegmentKeys(stream_t *s, 
hls_stream_t *hls)
     {
         prev_seg = seg;
         seg = segment_GetSegment(hls, i);
+        if (seg == NULL )
+            continue;
         if (seg->psz_key_path == NULL)
             continue;   /* No key to load ? continue */
         if (seg->b_key_loaded)

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to