block: cancellation safety

[vlc] / include / vlc_charset.h

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 0788b17f2487a22747d8e75dd6f05dac615c1d70..5bd3faa429b145fe0128c04f1b639668b03997da 100644 (file)
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -22,8 +22,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef __VLC_CHARSET_H
-#define __VLC_CHARSET_H 1
+#ifndef VLC_CHARSET_H
+#define VLC_CHARSET_H 1
+
+/**
+ * \file
+ * This files handles locale conversions in vlc
+ */
 
 #include <stdarg.h>
 #include <sys/types.h>
@@ -67,7 +72,8 @@ static inline char *FromWide (const wchar_t *wide)
 
     char *out = (char *)malloc (len);
 
-    WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
+    if (out)
+        WideCharToMultiByte (CP_UTF8, 0, wide, -1, out, len, NULL, NULL);
     return out;
 }
 #endif