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

Fixed segfault with (dvd://1 -chapter). Bug reported by Gabucino, initial fix by Pierre. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10602 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-08-13 21:32:28 +00:00
parent c0298b66cd
commit e817ade915
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libmpdemux/open.c
View File

@ -535,7 +535,8 @@ if(strncmp("dvd://",filename,6) == 0){
int dvd_parse_chapter_range(m_option_t *conf, const char *range){
const char *s;
char *t;
/* conf; prevent warning from GCC */
if (!range)
return M_OPT_MISSING_PARAM;
s = range;
dvd_chapter = 1;
dvd_last_chapter = 0;
@ -543,26 +544,26 @@ int dvd_parse_chapter_range(m_option_t *conf, const char *range){
dvd_chapter = strtol(range, &s, 10);
if (range == s) {
mp_msg(MSGT_OPEN, MSGL_ERR, "Invalid chapter range specification %s\n", range);
return -1;
return M_OPT_INVALID;
}
}
if (*s == 0)
return 0;
else if (*s != '-') {
mp_msg(MSGT_OPEN, MSGL_ERR, "Invalid chapter range specification %s\n", range);
return -1;
return M_OPT_INVALID;
}
++s;
if (*s == 0)
return 0;
if (! isdigit(*s)) {
mp_msg(MSGT_OPEN, MSGL_ERR, "Invalid chapter range specification %s\n", range);
return -1;
return M_OPT_INVALID;
}
dvd_last_chapter = strtol(s, &t, 10);
if (s == t || *t) {
mp_msg(MSGT_OPEN, MSGL_ERR, "Invalid chapter range specification %s\n", range);
return -1;
return M_OPT_INVALID;
}
return 0;
}