Changeset ccf664e20dd3dbf5feb554299c6267c9815da582

Timestamp:

26/01/07 23:37:28 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[9c3e6c5367a085e41794efae05eb5c1a20ff1394]

git-author:

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

Message:

add new filename_sanitize and path_sanitize functions to remove forbidden charcters from filenames/paths and use where appropriate.

Files:

• include/vlc_strings.h (modified) (1 diff)
• modules/access_output/file.c (modified) (1 diff)
• modules/video_filter/marq.c (modified) (2 diffs)
• modules/video_output/image.c (modified) (2 diffs)
• src/text/strings.c (modified) (3 diffs)
• src/video_output/vout_intf.c (modified) (2 diffs)

include/vlc_strings.h

@@ -39 +39 @@
-VLC_EXPORT( char *, convert_xml_special_chars, ( const char *psz_content ) );
-
-
+onst c
-#define str_format_meta( a, b ) __str_format_meta( VLC_OBJECT( a ), b )
-
+
+
+
+
+
+
-
-/**

modules/access_output/file.c

@@ -133 +133 @@
-    {
-        int fd;
-
-
-
+
+
+
+
-        free( psz_tmp );
-        fd = utf8_open( psz_tmp2, i_flags, 0666 );
-        free( psz_tmp2 );
-
-        if( fd == -1 )

modules/video_filter/marq.c

@@ -252 +252 @@
-    video_format_t fmt;
-    time_t t;
-    char *buf;
-
-    if( p_sys->last_time == time( NULL ) )
@@ -290 +289 @@
-        p_sys->b_need_update = VLC_FALSE;
-    }
-
-
-
+
-    p_spu->i_start = date;
-    p_spu->i_stop  = p_sys->i_timeout == 0 ? 0 : date + p_sys->i_timeout * 1000;

modules/video_output/image.c

@@ -281 +281 @@
-
-    if( p_vout->p_sys->b_time )
+    {
-        psz_tmp = str_format_time( p_vout->p_sys->psz_prefix );
+        path_sanitize( psz_tmp );
+    }
-    else
-        psz_tmp = p_vout->p_sys->psz_prefix;
@@ -287 +290 @@
-    {
-        psz_prefix = str_format_meta( p_vout, psz_tmp );
+        path_sanitize( psz_prefix );
-        if( p_vout->p_sys->b_time )
-            free( psz_tmp );

src/text/strings.c

@@ -332 +332 @@
- * String formating functions
- ****************************************************************************/
-
+ const 
-{
-    char buffer[255];
@@ -370 +370 @@
-                        d++;                                        \
-                    }
-
-
-
+onst c
+
+onst c
-    char *dst = malloc( 1000 );
-    char *d = dst;
@@ -647 +647 @@
-    return dst;
-}
+
+/**
+ * Apply str format time and str format meta
+ */
+char *__str_format( vlc_object_t *p_this, const char *psz_src )
+{
+    char *psz_buf1, *psz_buf2;
+    psz_buf1 = str_format_time( psz_src );
+    psz_buf2 = str_format_meta( p_this, psz_buf1 );
+    free( psz_buf1 );
+    return psz_buf2;
+}
+
+/**
+ * Remove forbidden characters from filenames (including slashes)
+ */
+void filename_sanitize( char *str )
+{
+    while( *str )
+    {
+        switch( *str )
+        {
+            case '/':
+#ifdef WIN32
+            case '*':
+            case '.':
+            case '"':
+            case '\\':
+            case '[':
+            case ']':
+            case ':':
+            case ';':
+            case '|':
+            case '=':
+#endif
+                *str = '_';
+        }
+    }
+}
+
+/**
+ * Remove forbidden characters from full paths (leaves slashes)
+ */
+void path_sanitize( char *str )
+{
+    while( *str )
+    {
+        switch( *str )
+        {
+#ifdef WIN32
+            case '*':
+            case '.':
+            case '"':
+            case '[':
+            case ']':
+            case ':':
+            case ';':
+            case '|':
+            case '=':
+#endif
+                *str = '_';
+        }
+    }
+}

src/video_output/vout_intf.c

@@ -639 +639 @@
-        else
-        {
-
+
+
-            free( psz_prefix );
-
-
+
-        }
-
@@ -670 +670 @@
-    else // The user specified a full path name (including file name)
-    {
-
+
+
-    }
-