Fix potential NULL pointer dereference.

dcd8b628 · Rémi Duraffort · 93baedd3 · dcd8b628
Commit dcd8b628 authored Mar 10, 2011 by Rémi Duraffort
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

src/input/item.c src/input/item.c +2 -3

No files found.
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -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;