Fix potential segfault and move code (CID 178)

modules/control/http/util.c

@@ -345,24 +345,21 @@ void PlaylistListNode( intf_thread_t *p_intf, playlist_t *p_pl,
                            playlist_item_t *p_node, char *name, mvar_t *s,
                            int i_depth )
 {
-    if( p_node != NULL )
-    {
+    if( !p_node || !p_node->p_input )
+        return;
+
     if( p_node->i_children == -1 )
     {
         char value[512];
         char *psz;
         mvar_t *itm = mvar_New( name, "set" );
-            playlist_item_t * p_item = playlist_CurrentPlayingItem(p_pl);
-            if( p_item && p_node &&
-                p_item->p_input && p_node->p_input &&
-                p_item->p_input->i_id == p_node->p_input->i_id )
-            {
+        playlist_item_t * p_item = playlist_CurrentPlayingItem( p_pl );
+        if( !p_item || !p_item->p_input )
+            return;
+        if( p_item->p_input->i_id == p_node->p_input->i_id )
             mvar_AppendNewVar( itm, "current", "1" );
-            }
         else
-            {
             mvar_AppendNewVar( itm, "current", "0" );
-            }
 
         sprintf( value, "%d", p_node->i_id );
         mvar_AppendNewVar( itm, "index", value );
@@ -382,13 +379,9 @@ void PlaylistListNode( intf_thread_t *p_intf, playlist_t *p_pl,
         mvar_AppendNewVar( itm, "depth", value );
 
         if( p_node->i_flags & PLAYLIST_RO_FLAG )
-            {
             mvar_AppendNewVar( itm, "ro", "ro" );
-            }
         else
-            {
             mvar_AppendNewVar( itm, "ro", "rw" );
-            }
 
         sprintf( value, "%ld",
                  (long) input_item_GetDuration( p_node->p_input ) );
@@ -418,22 +411,15 @@ void PlaylistListNode( intf_thread_t *p_intf, playlist_t *p_pl,
         mvar_AppendNewVar( itm, "depth", value );
 
         if( p_node->i_flags & PLAYLIST_RO_FLAG )
-            {
             mvar_AppendNewVar( itm, "ro", "ro" );
-            }
         else
-            {
             mvar_AppendNewVar( itm, "ro", "rw" );
-            }
 
         mvar_AppendVar( s, itm );
 
-            for (i_child = 0 ; i_child < p_node->i_children ; i_child++)
-                PlaylistListNode( p_intf, p_pl,
-                                      p_node->pp_children[i_child],
+        for( i_child = 0 ; i_child < p_node->i_children ; i_child++ )
+             PlaylistListNode( p_intf, p_pl, p_node->pp_children[i_child],
                                name, s, i_depth + 1);
-
-        }
     }
 }