diff options
| -rw-r--r-- | demux/demux_playlist.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c index 38011f80b7..b7a752468b 100644 --- a/demux/demux_playlist.c +++ b/demux/demux_playlist.c @@ -30,6 +30,7 @@ struct pl_parser { char buffer[8 * 1024]; int utf16; struct playlist *pl; + bool error; bool probing; }; @@ -40,6 +41,8 @@ static char *pl_get_line0(struct pl_parser *p) int len = strlen(res); if (len > 0 && res[len - 1] == '\n') res[len - 1] = '\0'; + } else { + p->error |= !p->s->eof; } return res; } @@ -58,7 +61,7 @@ static void pl_add(struct pl_parser *p, bstr entry) static bool pl_eof(struct pl_parser *p) { - return p->s->eof; + return p->error || p->s->eof; } static int parse_m3u(struct pl_parser *p) @@ -175,9 +178,10 @@ static int open_file(struct demuxer *demuxer, enum demux_check check) } p->probing = false; + p->error = false; p->s = demuxer->stream; p->utf16 = stream_skip_bom(p->s); - bool ok = fmt->parse(p) >= 0; + bool ok = fmt->parse(p) >= 0 && !p->error; if (ok) playlist_add_base_path(p->pl, mp_dirname(demuxer->filename)); demuxer->playlist = talloc_steal(demuxer, p->pl); |