[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
localename: fix crash on mingw
From: |
Bruno Haible |
Subject: |
localename: fix crash on mingw |
Date: |
Sat, 27 Apr 2019 20:01:35 +0200 |
User-agent: |
KMail/5.1.3 (Linux/4.4.0-141-generic; KDE/5.18.0; x86_64; ; ) |
The localename test currently crashes on mingw.
This patch fixes it.
2019-04-27 Bruno Haible <address@hidden>
localename: Fix crash on mingw (regression from 2018-11-23).
* lib/localename.c (gl_locale_name_posix): Don't attempt to convert a
locale name that is null.
diff --git a/lib/localename.c b/lib/localename.c
index 1cb0a90..1b1bb19 100644
--- a/lib/localename.c
+++ b/lib/localename.c
@@ -3294,15 +3294,16 @@ gl_locale_name_posix (int category, const char
*categoryname)
/* Convert the locale name from the format returned by setlocale() or found
in the environment variables to the XPG syntax. */
#if defined WINDOWS_NATIVE
- {
- /* Convert locale name to LCID. We don't want to use
- LocaleNameToLCID because (a) it is only available since Vista,
- and (b) it doesn't accept locale names returned by 'setlocale'. */
- LCID lcid = get_lcid (locname);
+ if (locname != NULL)
+ {
+ /* Convert locale name to LCID. We don't want to use
+ LocaleNameToLCID because (a) it is only available since Vista,
+ and (b) it doesn't accept locale names returned by 'setlocale'. */
+ LCID lcid = get_lcid (locname);
- if (lcid > 0)
- return gl_locale_name_from_win32_LCID (lcid);
- }
+ if (lcid > 0)
+ return gl_locale_name_from_win32_LCID (lcid);
+ }
#endif
return locname;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- localename: fix crash on mingw,
Bruno Haible <=