[MPlayer-cvslog] r22020 - in trunk: mp_msg.c mp_msg.h mplayer.c

[Vladimir Voroshilov]

2007/1/26, gpoirier <subversion at mplayerhq.hu>:
> Author: gpoirier
> Date: Fri Jan 26 10:57:09 2007
> New Revision: 22020
>
> Modified:
>   trunk/mp_msg.c
>   trunk/mp_msg.h
>   trunk/mplayer.c
>
> Log:
> filename double-conversion, especially usefull for CJK users :-)
> Patch by Zuxy Meng <zuxy.meng at gmail.com>
> date: Oct 25, 2006 2:20 AM
> subject: [MPlayer-dev-eng] [PATCH] Filename double-conversion

After applying this patch MPLayer crashes under MinGW when
MPLAYER_CHARSET environment variable is not defined and langinfo is
not used (which happens in most cases, i think).
Fix attached.

-- 
Regards,
Vladimir Voroshilov     mailto:voroshil at gmail.com
JID: voroshil at jabber.ru
ICQ: 95587719
-------------- next part --------------
Index: mp_msg.c
===================================================================
--- mp_msg.c	(revision 22022)
+++ mp_msg.c	(working copy)
@@ -48,7 +48,7 @@
     static char recoded_filename[MSGSIZE_MAX];
     size_t filename_len, max_path;
     char* precoded;
-    if (!strcasecmp(mp_msg_charset, MSG_CHARSET) ||
+    if (!mp_msg_charset || !strcasecmp(mp_msg_charset, MSG_CHARSET) ||
 	    !strcasecmp(mp_msg_charset, "noconv"))
        return filename;	
     if (inv_msgiconv == (iconv_t)(-1)) {