Changeset e22607b4b9712c117f394267d6631e5eef8d0e9b

Timestamp:

03/02/07 22:00:22 (1 year ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1172869222 +0000

git-parent:

[512f81c76f0e1e3253ccca718169c6d1f0a8f318]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1172869222 +0000

Message:

Don't authorize "." or ".." for filenames.

Files:

• src/text/strings.c (modified) (3 diffs)

src/text/strings.c

@@ -799 +799 @@
-void filename_sanitize( char *str )
-{
+    if( *str == '.' && (str[1] == '\0' || (str[1] == '.' && str[2] == '\0' ) ) )
+    {
+        while( *str )
+        {
+            *str = '_';
+            str++;
+        }
+        return;
+    }
+
-    while( *str )
-    {
@@ -825 +835 @@
-void path_sanitize( char *str )
-{
+#if 0
+    Uncomment the two blocks to prevent /../ or /./, i'm not sure that we
+    want to.
+    char *prev = str - 1;
+#endif
+    while( *str )
+    {
-#ifdef WIN32
-    while( *str )
-    {
-        switch( *str )
-        {
@@ -839 +854 @@
-                *str = '_';
-        }
+#endif
+#if 0
+        if( *str == '/'
+#ifdef WIN32
+            || *str == '\\'
+#endif
+            )
+        {
+            if( str - prev == 2 && prev[1] == '.' )
+            {
+                prev[1] = '.';
+            }
+            else if( str - prev == 3 && prev[1] == '.' && prev[2] == '.' )
+            {
+                prev[1] = '_';
+                prev[2] = '_';
+            }
+            prev = str;
+        }
+#endif
-        str++;
-    }
-
-
+