[vlc-commits] Fix potential NULL pointer dereference.

[Rémi Duraffort]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Mar 10 21:58:14 2011 +0100| [dcd8b628e03307a3b940ae050c1cf007c258428d] | committer: Rémi Duraffort

Fix potential NULL pointer dereference.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dcd8b628e03307a3b940ae050c1cf007c258428d
---

 src/input/item.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/input/item.c b/src/input/item.c
index 7c8c439..de510bc 100644
--- 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;