avformat/hls: respect http_persistent only for http playlist urls
authorAman Gupta <aman@tmm1.net>
Tue, 26 Dec 2017 02:25:13 +0000 (18:25 -0800)
committerAman Gupta <aman@tmm1.net>
Tue, 26 Dec 2017 22:48:14 +0000 (14:48 -0800)
Fixes a segfault when reading a live playlist (without end tag) from non-http url (like a file on disk).

Signed-off-by: Aman Gupta <aman@tmm1.net>
libavformat/hls.c

index c0bade0..2d46c2a 100644 (file)
@@ -725,8 +725,9 @@ static int parse_playlist(HLSContext *c, const char *url,
     struct variant_info variant_info;
     char tmp_str[MAX_URL_SIZE];
     struct segment *cur_init_section = NULL;
+    int is_http = av_strstart(url, "http", NULL);
 
-    if (!in && c->http_persistent && c->playlist_pb) {
+    if (is_http && !in && c->http_persistent && c->playlist_pb) {
         in = c->playlist_pb;
         ret = open_url_keepalive(c->ctx, &c->playlist_pb, url);
         if (ret == AVERROR_EXIT) {
@@ -760,7 +761,7 @@ static int parse_playlist(HLSContext *c, const char *url,
         if (ret < 0)
             return ret;
 
-        if (c->http_persistent)
+        if (is_http && c->http_persistent)
             c->playlist_pb = in;
         else
             close_in = 1;