]> git.sesse.net Git - vlc/commitdiff
Fix potential NULL pointer dereference.
authorRémi Duraffort <ivoire@videolan.org>
Thu, 10 Mar 2011 20:58:14 +0000 (21:58 +0100)
committerRémi Duraffort <ivoire@videolan.org>
Thu, 10 Mar 2011 20:58:14 +0000 (21:58 +0100)
src/input/item.c

index 7c8c439cc1a92d6aca8c6d4334f3a4b55db42d2b..de510bcc24acdd10c01c6aff2570e6a804e60fdf 100644 (file)
@@ -896,11 +896,10 @@ input_item_t *input_item_Copy( vlc_object_t *p_obj, input_item_t *p_input )
                                   p_input->ppsz_options[i],
                                   p_input->optflagv[i] );
         }
+        p_new_input->p_meta = vlc_meta_New();
+        vlc_meta_Merge( p_new_input->p_meta, p_input->p_meta );
     }
 
-    p_new_input->p_meta = vlc_meta_New();
-    vlc_meta_Merge( p_new_input->p_meta, p_input->p_meta );
-
     vlc_mutex_unlock( &p_input->lock );
 
     return p_new_input;