You shall not pass NULL to IsUTF8().

[vlc] / src / misc / unicode.c

diff --git a/src/misc/unicode.c b/src/misc/unicode.c
index 2348072f20100c4e32ae0c608318b016433038f2..3e90cbb5daa8b799571393dc2ace8e7d5629d3f6 100644 (file)
--- a/src/misc/unicode.c
+++ b/src/misc/unicode.c
@@ -140,18 +140,18 @@ static char *MB2MB( const char *string, UINT fromCP, UINT toCP )
     int len;
 
     len = MultiByteToWideChar( fromCP, 0, string, -1, NULL, 0 );
-    assert( len > 0 );
-    wide = (wchar_t *)malloc (len * sizeof (wchar_t));
-    if( wide == NULL )
+    if( len == 0 )
         return NULL;
 
+    wchar_t wide[len];
+
     MultiByteToWideChar( fromCP, 0, string, -1, wide, len );
     len = WideCharToMultiByte( toCP, 0, wide, -1, NULL, 0, NULL, NULL );
-    assert( len > 0 );
+    if( len == 0 )
+        return NULL;
     out = malloc( len );
 
     WideCharToMultiByte( toCP, 0, wide, -1, out, len, NULL, NULL );
-    free( wide );
     return out;
 }
 #endif
@@ -306,57 +306,41 @@ void LocaleFree( const char *str )
  */
 FILE *utf8_fopen( const char *filename, const char *mode )
 {
-#if !(defined (WIN32) || defined (UNDER_CE))
-    const char *local_name = ToLocale( filename );
-
-    if( local_name != NULL )
-    {
-        FILE *stream = fopen( local_name, mode );
-        LocaleFree( local_name );
-        return stream;
-    }
-    else
-        errno = ENOENT;
-    return NULL;
-#else
-    wchar_t wpath[MAX_PATH + 1];
-    size_t len = strlen( mode ) + 1;
-    wchar_t wmode[len];
-
-    if( !MultiByteToWideChar( CP_UTF8, 0, filename, -1, wpath, MAX_PATH )
-     || !MultiByteToWideChar( CP_ACP, 0, mode, len, wmode, len ) )
-    {
-        errno = ENOENT;
-        return NULL;
-    }
-    wpath[MAX_PATH] = L'\0';
-
-    /* retrieve OS version */
+#if defined (WIN32) || defined (UNDER_CE)
     if( GetVersion() < 0x80000000 )
     {
         /* for Windows NT and above */
+        wchar_t wpath[MAX_PATH + 1];
+        size_t len = strlen( mode ) + 1;
+        wchar_t wmode[len];
+
+        if( !MultiByteToWideChar( CP_UTF8, 0, filename, -1, wpath, MAX_PATH )
+         || !MultiByteToWideChar( CP_ACP, 0, mode, len, wmode, len ) )
+        {
+            errno = ENOENT;
+            return NULL;
+        }
+        wpath[MAX_PATH] = L'\0';
+
         /*
          * fopen() cannot open files with non-“ANSI” characters on Windows.
          * We use _wfopen() instead. Same thing for mkdir() and stat().
          */
         return _wfopen( wpath, wmode );
     }
-    else
+#endif
+    const char *local_name = ToLocale( filename );
+
+    if( local_name != NULL )
     {
-        /* for Windows Me/98/95 */
-        /* we use GetShortFileNameW to get the DOS 8.3 version of the file we need to open */
-        char spath[MAX_PATH + 1];
-        if( GetShortPathNameW( wpath, spath, MAX_PATH ) )
-        {
-            fprintf( stderr, "A fopen path: %s -> %s\n", wpath, spath );
-            wfprintf( stderr, "W fopen path: %s -> %s\n", wpath, spath );
-            return fopen( spath, wmode );
-        }
-        fprintf( stderr, "GetShortPathName for %s failed\n", wpath );
-        errno = ENOENT;
-        return NULL;
+        FILE *stream = fopen( local_name, mode );
+        LocaleFree( local_name );
+        return stream;
     }
-#endif
+    else
+        errno = ENOENT;
+
+    return NULL;
 }
 
 /**
@@ -419,6 +403,7 @@ int utf8_mkdir( const char *dirname )
 
 void *utf8_opendir( const char *dirname )
 {
+    /* TODO: support for WinNT non-ACP filenames */
     const char *local_name = ToLocale( dirname );
 
     if( local_name != NULL )
@@ -513,8 +498,24 @@ int utf8_scandir( const char *dirname, char ***namelist,
 static int utf8_statEx( const char *filename, void *buf,
                         vlc_bool_t deref )
 {
-#if !(defined (WIN32) || defined (UNDER_CE))
-# ifdef HAVE_SYS_STAT_H
+#if defined (WIN32) || defined (UNDER_CE)
+    /* retrieve Windows OS version */
+    if( GetVersion() < 0x80000000 )
+    {
+        /* for Windows NT and above */
+        wchar_t wpath[MAX_PATH + 1];
+
+        if( !MultiByteToWideChar( CP_UTF8, 0, filename, -1, wpath, MAX_PATH ) )
+        {
+            errno = ENOENT;
+            return -1;
+        }
+        wpath[MAX_PATH] = L'\0';
+
+        return _wstati64( wpath, (struct _stati64 *)buf );
+    }
+#endif
+#ifdef HAVE_SYS_STAT_H
     const char *local_name = ToLocale( filename );
 
     if( local_name != NULL )
@@ -525,39 +526,8 @@ static int utf8_statEx( const char *filename, void *buf,
         return res;
     }
     errno = ENOENT;
-# endif
-    return -1;
-#else
-    wchar_t wpath[MAX_PATH + 1];
-
-    if( !MultiByteToWideChar( CP_UTF8, 0, filename, -1, wpath, MAX_PATH ) )
-    {
-        errno = ENOENT;
-        return -1;
-    }
-    wpath[MAX_PATH] = L'\0';
-
-    /* retrieve Windows OS version */
-    if( GetVersion() < 0x80000000 )
-    {
-        /* for Windows NT and above */
-        return _wstati64( wpath, (struct _stati64 *)buf );
-    }
-    else
-    {
-        /* for Windows Me/98/95 */
-        /* we use GetShortFileNameW to get the DOS 8.3 version */
-        char spath[MAX_PATH + 1];
-        if( GetShortPathNameW( wpath, spath, MAX_PATH ) )
-        {
-            fprintf( stderr, "stati path: %s -> %s\n", wpath, spath );
-            return _stati64( spath, (struct _stati64 *)buf );
-        }
-        fprintf( stderr, "GetShortPathName for %s failed\n", wpath );
-        errno = ENOENT;
-        return -1;
-    }
 #endif
+    return -1;
 }
 
 
@@ -586,7 +556,7 @@ static int utf8_vasprintf( char **str, const char *fmt, va_list ap )
     return res;
 }
 
-static int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap )
+int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap )
 {
     char *str;
     int res = utf8_vasprintf( &str, fmt, ap );
@@ -615,6 +585,8 @@ static char *CheckUTF8( char *str, char rep )
 {
     unsigned char *ptr, c;
 
+    assert (str != NULL);
+
     ptr = (unsigned char *)str;
     while( (c = *ptr) != '\0' )
     {