summaryrefslogtreecommitdiffstats
path: root/m_option.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-08 09:07:51 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-08 09:07:51 +0000
commitab39d95f53cff3bb4a0b8910b28009ec019a747d (patch)
tree3ccdcbf14f924b99d484cad214a7d64326781f91 /m_option.c
parente0892295b555d8996b4aa2165e12ce40d1186157 (diff)
downloadmpv-ab39d95f53cff3bb4a0b8910b28009ec019a747d.tar.bz2
mpv-ab39d95f53cff3bb4a0b8910b28009ec019a747d.tar.xz
Fix variable dereference before NULL check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20103 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'm_option.c')
-rw-r--r--m_option.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/m_option.c b/m_option.c
index 1812d1ab54..0961dcc7c6 100644
--- a/m_option.c
+++ b/m_option.c
@@ -1787,7 +1787,7 @@ static int parse_obj_presets(m_option_t* opt,char *name,
m_obj_presets_t* obj_p = (m_obj_presets_t*)opt->priv;
m_struct_t *in_desc,*out_desc;
int s,i;
- unsigned char* pre = obj_p->presets;
+ unsigned char* pre;
char* pre_name = NULL;
if(!obj_p) {
@@ -1798,6 +1798,7 @@ static int parse_obj_presets(m_option_t* opt,char *name,
if(!param)
return M_OPT_MISSING_PARAM;
+ pre = obj_p->presets;
in_desc = obj_p->in_desc;
out_desc = obj_p->out_desc ? obj_p->out_desc : obj_p->in_desc;
s = in_desc->size;