From 6e51f47e137031e7caa561724d786f48e24970a1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 23 Mar 2005 14:53:35 +0000 Subject: [PATCH] [Win32] Fix corner case bug when environment variable value is exactly one 2005-03-23 Tor Lillqvist * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when environment variable value is exactly one character. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gutils.c | 4 ++++ 5 files changed, 24 insertions(+) diff --git a/ChangeLog b/ChangeLog index 31d3063..c853cac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-23 Tor Lillqvist + + * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when + environment variable value is exactly one character. + 2005-03-21 Matthias Clasen * glib/glib.symbols: Add g_try_malloc0 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 31d3063..c853cac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-03-23 Tor Lillqvist + + * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when + environment variable value is exactly one character. + 2005-03-21 Matthias Clasen * glib/glib.symbols: Add g_try_malloc0 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 31d3063..c853cac 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2005-03-23 Tor Lillqvist + + * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when + environment variable value is exactly one character. + 2005-03-21 Matthias Clasen * glib/glib.symbols: Add g_try_malloc0 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 31d3063..c853cac 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-03-23 Tor Lillqvist + + * glib/gutils.c (g_getenv): [Win32] Fix corner case bug when + environment variable value is exactly one character. + 2005-03-21 Matthias Clasen * glib/glib.symbols: Add g_try_malloc0 diff --git a/glib/gutils.c b/glib/gutils.c index b07a95a..4ad4995 100644 --- 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); -- 2.7.4