Changeset 6d2739944db9944855aa9c849d3cd30414c45a5b

Timestamp:

12/12/05 20:24:55 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1134415495 +0000

git-parent:

[d708c14a27fec63e1bd463189b5272ae458bd877]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1134415495 +0000

Message:

Don't recurse in symbolic link - fixes #375

Files:

• modules/access/directory.c (modified) (3 diffs)

modules/access/directory.c

@@ -369 +369 @@
-    return 0;
-}
+
-/*****************************************************************************
- * DemuxControl:
@@ -381 +382 @@
-    return VLC_TRUE;
-}
+
-/*****************************************************************************
- * ReadDir: read a directory and add its content to the list
- *****************************************************************************/
-
-const char *psz_name, 
+ const char *psz_name,
+
-{
-    struct dirent   **pp_dir_content;
@@ -466 +468 @@
-#endif
-            {
+#if defined( S_ISLNK )
+/*
+ * FIXME: there is a ToCToU race condition here; but it is rather tricky^W^W
+ * impossible to fix while keeping some kind of portable code, and maybe even
+ * in a non-portable way.
+ */
+                if( lstat( psz_uri, &stat_data )
+                 || S_ISLNK(stat_data.st_mode) )
+                {
+                    msg_Dbg( p_playlist, "Skipping directory symlink %s",
+                             psz_uri );
+                    free( psz_uri );
+                    continue;
+                }
+#endif
-                if( i_mode == MODE_NONE )
-                {