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.

1 files changed, 9 insertions, 8 deletions

diff --git a/lib/localename.c b/lib/localename.c
index 1cb0a90f0d..1b1bb19bb8 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;
   }