Make the g_getenv() ABI backward compatibility wrapper more robust.

2005-01-01  Tor Lillqvist  <tml@iki.fi>

	* glib/gutils.c: Make the g_getenv() ABI backward compatibility
	wrapper more robust.

diff --git a/ChangeLog b/ChangeLog
index da15a34..0463324 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-01  Tor Lillqvist  <tml@iki.fi>
 
+       * glib/gutils.c: Make the g_getenv() ABI backward compatibility
+       wrapper more robust.
+
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
        * glib/glib.symbols
        * glib/gutils.h
        * glib/gutils.c: Make also g_getenv(), g_setenv(), g_unsetenv()

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index da15a34..0463324 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-01-01  Tor Lillqvist  <tml@iki.fi>
 
+       * glib/gutils.c: Make the g_getenv() ABI backward compatibility
+       wrapper more robust.
+
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
        * glib/glib.symbols
        * glib/gutils.h
        * glib/gutils.c: Make also g_getenv(), g_setenv(), g_unsetenv()

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index da15a34..0463324 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,10 @@
 2005-01-01  Tor Lillqvist  <tml@iki.fi>
 
+       * glib/gutils.c: Make the g_getenv() ABI backward compatibility
+       wrapper more robust.
+
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
        * glib/glib.symbols
        * glib/gutils.h
        * glib/gutils.c: Make also g_getenv(), g_setenv(), g_unsetenv()

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index da15a34..0463324 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2005-01-01  Tor Lillqvist  <tml@iki.fi>
 
+       * glib/gutils.c: Make the g_getenv() ABI backward compatibility
+       wrapper more robust.
+
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
        * glib/glib.symbols
        * glib/gutils.h
        * glib/gutils.c: Make also g_getenv(), g_setenv(), g_unsetenv()

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index da15a34..0463324 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-01-01  Tor Lillqvist  <tml@iki.fi>
 
+       * glib/gutils.c: Make the g_getenv() ABI backward compatibility
+       wrapper more robust.
+
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
        * glib/glib.symbols
        * glib/gutils.h
        * glib/gutils.c: Make also g_getenv(), g_setenv(), g_unsetenv()

diff --git a/glib/gutils.c b/glib/gutils.c
index 5c92aba..c7de241 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -2386,10 +2386,14 @@ g_getenv (const gchar *variable)
 {
   gchar *utf8_variable = g_locale_to_utf8 (variable, -1, NULL, NULL, NULL);
   const gchar *utf8_value = g_getenv_utf8 (utf8_variable);
-  gchar *value = g_locale_from_utf8 (utf8_value, -1, NULL, NULL, NULL);
-  GQuark quark = g_quark_from_string (value);
+  gchar *value;
+  GQuark quark;
 
   g_free (utf8_variable);
+  if (!utf8_value)
+    return NULL;
+  value = g_locale_from_utf8 (utf8_value, -1, NULL, NULL, NULL);
+  quark = g_quark_from_string (value);
   g_free (value);
 
   return g_quark_to_string (quark);