[vlc-commits] item: missing NULL check

Rémi Denis-Courmont git at videolan.org
Mon Sep 28 20:14:32 CEST 2020


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 27 20:55:19 2020 +0300| [fa6cb10f6fa18a08ed362d061908fe4b9e3b2178] | committer: Rémi Denis-Courmont

item: missing NULL check

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

 src/input/item.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/input/item.c b/src/input/item.c
index 1c03af739b..714a839dda 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -1115,7 +1115,8 @@ input_item_t *input_item_Copy( input_item_t *p_input )
     if( likely(item != NULL) && p_input->p_meta != NULL )
     {
         meta = vlc_meta_New();
-        vlc_meta_Merge( meta, p_input->p_meta );
+        if( likely(meta != NULL) )
+            vlc_meta_Merge( meta, p_input->p_meta );
     }
     b_net = p_input->b_net;
 



More information about the vlc-commits mailing list