RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_playlist: simplify ini parsing 

In acac614032, I sort of cargoculted what
I had to do for m3u, but it's actually not needed. bstr_split_tok
unexpectedly doesn't modify the original string. So the line_dup
business in the ini parsing is not needed. Remove it. The part in
parse_ref_init isn't wrong but naming the variable "line_dup" instead of
"value" is stupid so adjust that. And finally, you can actually force a
codepage in mpv (add "+" before the codepage) which will cause every
line to be allocated memory including the header lines even though those
are obviously valid utf8 that should never need conversion. This wasn't
taken into account so add an extra pl_free_line in a couple of places to
make sure they are freed.
This commit is contained in:
Dudemanguy 2023-11-12 13:18:34 -06:00
parent ad02db8cee
commit d124449c3d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
demux/demux_playlist.c
View File

@ -283,6 +283,7 @@ static int parse_ref_init(struct pl_parser *p)
pl_free_line(p, line); pl_free_line(p, line);
return -1; return -1;
} }
pl_free_line(p, line);
// ASF http streaming redirection - this is needed because ffmpeg http:// // ASF http streaming redirection - this is needed because ffmpeg http://
// and mmsh:// can not automatically switch automatically between each // and mmsh:// can not automatically switch automatically between each
@ -301,11 +302,11 @@ static int parse_ref_init(struct pl_parser *p)
while (!pl_eof(p)) { while (!pl_eof(p)) {
line = pl_get_line(p); line = pl_get_line(p);
bstr line_dup = line; bstr value;
if (bstr_case_startswith(line_dup, bstr0("Ref"))) { if (bstr_case_startswith(line, bstr0("Ref"))) {
bstr_split_tok(line, "=", &(bstr){0}, &line_dup); bstr_split_tok(line, "=", &(bstr){0}, &value);
if (line_dup.len) if (value.len)
pl_add(p, line_dup); pl_add(p, value);
} }
pl_free_line(p, line); pl_free_line(p, line);
} }
@ -326,11 +327,11 @@ static int parse_ini_thing(struct pl_parser *p, const char *header,
pl_free_line(p, line); pl_free_line(p, line);
return 0; return 0;
} }
pl_free_line(p, line);
while (!pl_eof(p)) { while (!pl_eof(p)) {
line = pl_get_line(p); line = pl_get_line(p);
bstr line_dup = line;
bstr key, value; bstr key, value;
if (bstr_split_tok(line_dup, "=", &key, &value) && if (bstr_split_tok(line, "=", &key, &value) &&
bstr_case_startswith(key, bstr0(entry))) bstr_case_startswith(key, bstr0(entry)))
{ {
value = bstr_strip(value); value = bstr_strip(value);