From 73f13dfc4259317a3c1e658cbfa86d517ef14478 Mon Sep 17 00:00:00 2001 From: "wenjie.zhao" Date: Thu, 12 Mar 2015 23:39:44 +0800 Subject: [PATCH 1/2] fix hls muxer Segmentation fault. --- trunk/src/app/srs_app_hls.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 8cf8dc74c..7328bc4c9 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -731,6 +731,10 @@ int SrsHlsCache::write_audio(SrsAvcAacCodec* codec, SrsHlsMuxer* muxer, int64_t } } + if (!cache->audio) { + return ret; + } + // TODO: config it. // in ms, audio delay to flush the audios. int64_t audio_delay = SRS_CONF_DEFAULT_AAC_DELAY; From efe3050d7a67e046eb3e1f8f783ca90e937cc3cb Mon Sep 17 00:00:00 2001 From: "wenjie.zhao" Date: Thu, 12 Mar 2015 23:50:21 +0800 Subject: [PATCH 2/2] fix hls muxer Segmentation fault. --- trunk/src/app/srs_app_hls.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 7328bc4c9..8d6dbc75f 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -731,6 +731,8 @@ int SrsHlsCache::write_audio(SrsAvcAacCodec* codec, SrsHlsMuxer* muxer, int64_t } } + // cache->audio will be free in flush_audio + // so we must check whether it's null ptr. if (!cache->audio) { return ret; }