]> git.sesse.net Git - vlc/commitdiff
Some objects have no name. Fix segmentation fault.
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 23 Jan 2010 16:32:38 +0000 (18:32 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 23 Jan 2010 16:34:29 +0000 (18:34 +0200)
src/misc/objects.c

index 1ac347d514644dd6e65fad4c0ec114200769ae61..0e92c926b65ffba099416cfabe56aa1e7e2d04eb 100644 (file)
@@ -884,7 +884,8 @@ static vlc_object_t *FindParentName (vlc_object_t *p_this, const char *name)
          parent != NULL;
          parent = parent->p_parent)
     {
-        if (!strcmp (vlc_internals (parent)->psz_name, name))
+        const char *objname = vlc_internals (parent)->psz_name;
+        if (objname && !strcmp (objname, name))
             return vlc_object_hold (parent);
     }
     return NULL;
@@ -909,7 +910,7 @@ static vlc_object_t *FindChildName (vlc_object_internals_t *priv,
 {
     for (priv = priv->first; priv != NULL; priv = priv->next)
     {
-        if (!strcmp (priv->psz_name, name))
+        if (priv->psz_name && !strcmp (priv->psz_name, name))
             return vlc_object_hold (vlc_externals (priv));
 
         vlc_object_t *found = FindChildName (priv, name);