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

stream_bluray: check title index/playlist range 

Blu-ray title index/playlist must be in the range 0-99999, otherwise
an error will be returned
This commit is contained in:
schnusch 2016-10-15 09:20:29 +02:00 committed by wm4
parent 51dbb5607e
commit 68839e4e77
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
stream/stream_bluray.c
View File

@ -480,14 +480,28 @@ static int bluray_stream_open(stream_t *s)
b->cfg_title = BLURAY_MENU_TITLE; b->cfg_title = BLURAY_MENU_TITLE;
} else if (bstr_equals0(title, "mpls")) { } else if (bstr_equals0(title, "mpls")) {
bstr_split_tok(bdevice, "/", &title, &bdevice); bstr_split_tok(bdevice, "/", &title, &bdevice);
b->cfg_playlist = bstrtoll(title, &rest, 10); long long pl = bstrtoll(title, &rest, 10);
b->cfg_title = BLURAY_PLAYLIST_TITLE;
} else if (title.len) {
b->cfg_title = bstrtoll(title, &rest, 10);
}
if (rest.len) { if (rest.len) {
MP_ERR(s, "number expected: '%.*s'\n", BSTR_P(rest)); MP_ERR(s, "number expected: '%.*s'\n", BSTR_P(rest));
return STREAM_ERROR; return STREAM_ERROR;
} else if (pl < 0 || 99999 < pl) {
MP_ERR(s, "invalid playlist: '%.*s', must be in the range 0-99999\n",
BSTR_P(title));
return STREAM_ERROR;
}
b->cfg_playlist = pl;
b->cfg_title = BLURAY_PLAYLIST_TITLE;
} else if (title.len) {
long long t = bstrtoll(title, &rest, 10);
if (rest.len) {
MP_ERR(s, "number expected: '%.*s'\n", BSTR_P(rest));
return STREAM_ERROR;
} else if (t < 0 || 99999 < t) {
MP_ERR(s, "invalid title: '%.*s', must be in the range 0-99999\n",
BSTR_P(title));
return STREAM_ERROR;
}
b->cfg_title = t;
} }
b->cfg_device = bstrto0(b, bdevice); b->cfg_device = bstrto0(b, bdevice);