[MPlayer-cvslog] r20103 - trunk/m_option.c

reimar subversion at mplayerhq.hu
Sun Oct 8 11:07:51 CEST 2006


Author: reimar
Date: Sun Oct  8 11:07:51 2006
New Revision: 20103

Modified:
   trunk/m_option.c

Log:
Fix variable dereference before NULL check.


Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c	(original)
+++ trunk/m_option.c	Sun Oct  8 11:07:51 2006
@@ -1787,7 +1787,7 @@
   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 @@
   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;



More information about the MPlayer-cvslog mailing list