[Win32] Fix corner case bug when environment variable value is exactly one

2005-03-23  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.c (g_getenv): [Win32] Fix corner case bug when
	environment variable value is exactly one character.

diff --git a/ChangeLog b/ChangeLog
index 31d3063..c853cac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-23  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when
+       environment variable value is exactly one character.
+
 2005-03-21  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/glib.symbols: Add g_try_malloc0

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 31d3063..c853cac 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-03-23  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when
+       environment variable value is exactly one character.
+
 2005-03-21  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/glib.symbols: Add g_try_malloc0

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 31d3063..c853cac 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-03-23  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when
+       environment variable value is exactly one character.
+
 2005-03-21  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/glib.symbols: Add g_try_malloc0

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 31d3063..c853cac 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-03-23  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when
+       environment variable value is exactly one character.
+
 2005-03-21  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/glib.symbols: Add g_try_malloc0

diff --git a/glib/gutils.c b/glib/gutils.c
index b07a95a..4ad4995 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -1009,6 +1009,8 @@ g_getenv (const gchar *variable)
          g_free (wname);
          return NULL;
        }
+      else if (len == 1)
+       len = 2;
 
       wvalue = g_new (wchar_t, len);
 
@@ -1060,6 +1062,8 @@ g_getenv (const gchar *variable)
          g_free (cpname);
          return NULL;
        }
+      else if (len == 1)
+       len = 2;
 
       cpvalue = g_new (gchar, len);