Don't use someone's else domain in our default values

[vlc] / modules / access / directory.c

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 9ab5f67bccc6851348cb8e7e0e4521c1808c4550..5f36d4399aa463b039813ec27a4f13a2e0cecf5f 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -28,6 +28,7 @@
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 #include <vlc_playlist.h>
+#include <vlc_input.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -246,7 +247,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
 
     msg_Dbg( p_access, "opening directory `%s'", p_access->psz_path );
 
-    if( p_playlist->status.p_item->p_input ==
+    if( p_playlist->status.p_item && p_playlist->status.p_item->p_input ==
         ((input_thread_t *)p_access->p_parent)->input.p_item )
     {
         p_item = p_playlist->status.p_item;
@@ -387,14 +388,30 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
                     int i_mode, playlist_item_t *p_parent,
                     playlist_item_t *p_parent_category )
 {
-    struct dirent   **pp_dir_content;
-    int             i_dir_content, i;
+    struct dirent   **pp_dir_content = 0;
+    int             i_dir_content, i, i_return = VLC_SUCCESS;
     playlist_item_t *p_node;
 
-    /* Build array with ignores */
     char **ppsz_extensions = 0;
     int i_extensions = 0;
-    char *psz_ignore = var_CreateGetString( p_playlist, "ignore-filetypes" );
+    char *psz_ignore;
+
+    /* Get the first directory entry */
+    i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort );
+    if( i_dir_content == -1 )
+    {
+        msg_Warn( p_playlist, "failed to read directory" );
+        return VLC_EGENERIC;
+    }
+    else if( i_dir_content <= 0 )
+    {
+        /* directory is empty */
+        if( pp_dir_content ) free( pp_dir_content );
+        return VLC_SUCCESS;
+    }
+
+    /* Build array with ignores */
+    psz_ignore = var_CreateGetString( p_playlist, "ignore-filetypes" );
     if( psz_ignore && *psz_ignore )
     {
         char *psz_parser = psz_ignore;
@@ -422,19 +439,6 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
         }
     }
 
-    /* get the first directory entry */
-    i_dir_content = scandir( psz_name, &pp_dir_content, Filter, alphasort );
-    if( i_dir_content == -1 )
-    {
-        msg_Warn( p_playlist, "failed to read directory" );
-        return VLC_EGENERIC;
-    }
-    else if( i_dir_content <= 0 )
-    {
-        /* directory is empty */
-        return VLC_SUCCESS;
-    }
-
     /* While we still have entries in the directory */
     for( i = 0; i < i_dir_content; i++ )
     {
@@ -501,17 +505,18 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
                                                       p_parent_category );
                     }
 
+                    /* an strdup() just because of Mac OS X */
+                    free( psz_newname );
+
                     /* If we had the parent in category, the it is now node.
                      * Else, we still don't have  */
                     if( ReadDir( p_playlist, psz_uri , MODE_EXPAND,
                                  p_node, p_parent_category ? p_node : NULL )
                           != VLC_SUCCESS )
                     {
-                        return VLC_EGENERIC;
+                        i_return = VLC_EGENERIC;
+                        break;
                     }
-
-                    /* an strdup() just because of Mac OS X */
-                    free( psz_newname );
                 }
             }
             else
@@ -562,15 +567,14 @@ static int ReadDir( playlist_t *p_playlist, const char *psz_name,
     }
 
     for( i = 0; i < i_extensions; i++ )
-    {
-        if( ppsz_extensions[i] )
-            free( ppsz_extensions[i] );
-    }
+        if( ppsz_extensions[i] ) free( ppsz_extensions[i] );
     if( ppsz_extensions ) free( ppsz_extensions );
+
     if( psz_ignore ) free( psz_ignore );
 
     for( i = 0; i < i_dir_content; i++ )
         if( pp_dir_content[i] ) free( pp_dir_content[i] );
     if( pp_dir_content ) free( pp_dir_content );
-    return VLC_SUCCESS;
+
+    return i_return;
 }