Changeset 914f20188c38ba6657c578fce381e1b42e651766

Timestamp:

11/01/06 08:50:44 (2 years ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1162367444 +0000

git-parent:

[8741be0247e758e02802869b6e2616fc79fa4370]

git-author:

Rafaël Carré <funman@videolan.org> 1162367444 +0000

Message:

Makes file plugin fail to access directories
Some sanity checks

Files:

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

modules/access/file.c

@@ -162 +162 @@
-    else
-    {
+/* returns early if psz_path is a directory */
+#ifdef HAVE_SYS_STAT_H
+        struct stat stat_info;
+
+        if( utf8_stat( p_access->psz_path, &stat_info ) )
+        {
+            msg_Warn( p_access, "%s: %s", p_access->psz_path,
+                    strerror( errno ) );
+            return VLC_EGENERIC;
+        }
+        if S_ISDIR(stat_info.st_mode)
+        {
+            msg_Warn( p_access, "%s is a directory", p_access->psz_path );
+            return VLC_EGENERIC;
+        }
+#endif
+
-        p_sys->b_seekable = VLC_TRUE;
-        p_sys->b_pace_control = VLC_TRUE;
+
-    }
-
@@ -491 +509 @@
-static char *expand_path (const access_t *p_access, const char *path)
-{
-strncmp (path, "~/", 2) == 0
+ ( strlen (path) >= 2 ) && ( strncmp (path, "~/", 2) == 0 )
-    {
-        char *res;
@@ -502 +520 @@
-
-#if defined(WIN32)
-
+
+
-      && ('/' == path[0]) && path[1] && (':' == path[2]) && ('/' == path[3]))
-        // Explorer can open path such as file:/C:/ or file:///C:/