mirror of
https://github.com/mpv-player/mpv
synced 2024-12-24 15:52:25 +00:00
Fix crash with e.g. -vf scale=::
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15744 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
c6e32e91b1
commit
8193073010
10
m_option.c
10
m_option.c
@ -1261,8 +1261,16 @@ static int get_obj_params(char* opt_name, char* name,char* params,
|
||||
last_ptr = ptr+1;
|
||||
}
|
||||
if(r < 0) return r;
|
||||
if (!last_ptr[0]) // count an empty field at the end, too
|
||||
nold++;
|
||||
if (nold > nopts) {
|
||||
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Too many options for %s\n", name);
|
||||
return M_OPT_OUT_OF_RANGE;
|
||||
}
|
||||
if(!_ret) // Just test
|
||||
return 1;
|
||||
if (n == 0) // No options or only empty options
|
||||
return 1;
|
||||
|
||||
ret = malloc((n+2)*2*sizeof(char*));
|
||||
n = nold = 0;
|
||||
@ -1309,6 +1317,8 @@ static int parse_obj_params(m_option_t* opt,char *name,
|
||||
return r;
|
||||
if(!dst)
|
||||
return 1;
|
||||
if (!opts) // no arguments given
|
||||
return 1;
|
||||
|
||||
for(r = 0 ; opts[r] ; r += 2)
|
||||
m_struct_set(desc,dst,opts[r],opts[r+1]);
|
||||
|
Loading…
Reference in New Issue
Block a user