Work around an bug in Mac OS < 10.3. (#156446, Dave MacLachlan)

2004-11-07  Matthias Clasen  <mclasen@redhat.com>

	* glib/gutils.c (g_get_any_init): Work around an bug
	in Mac OS < 10.3.  (#156446, Dave MacLachlan)

diff --git a/ChangeLog b/ChangeLog
index 418d26577754b71b9d458ef6479a94d2d15e4357..ead6b15ed4f4a4bdf492f43e8eb6df4309d5c2cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.c (g_get_any_init): Work around an bug
+       in Mac OS < 10.3.  (#156446, Dave MacLachlan)
+
 2004-11-06  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 418d26577754b71b9d458ef6479a94d2d15e4357..ead6b15ed4f4a4bdf492f43e8eb6df4309d5c2cc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-11-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.c (g_get_any_init): Work around an bug
+       in Mac OS < 10.3.  (#156446, Dave MacLachlan)
+
 2004-11-06  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 418d26577754b71b9d458ef6479a94d2d15e4357..ead6b15ed4f4a4bdf492f43e8eb6df4309d5c2cc 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-11-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.c (g_get_any_init): Work around an bug
+       in Mac OS < 10.3.  (#156446, Dave MacLachlan)
+
 2004-11-06  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 418d26577754b71b9d458ef6479a94d2d15e4357..ead6b15ed4f4a4bdf492f43e8eb6df4309d5c2cc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-11-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.c (g_get_any_init): Work around an bug
+       in Mac OS < 10.3.  (#156446, Dave MacLachlan)
+
 2004-11-06  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 418d26577754b71b9d458ef6479a94d2d15e4357..ead6b15ed4f4a4bdf492f43e8eb6df4309d5c2cc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-11-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutils.c (g_get_any_init): Work around an bug
+       in Mac OS < 10.3.  (#156446, Dave MacLachlan)
+
 2004-11-06  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL

diff --git a/glib/gutils.c b/glib/gutils.c
index fef336112f39cfa9262b07900685cb6cd9eb0834..9a3a16441bee0cd39bbb6bd757147f8d979847dc 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -1061,7 +1061,10 @@ g_get_any_init (void)
         do
           {
             g_free (buffer);
-            buffer = g_malloc (bufsize);
+           /* we allocate 6 extra bytes to work around a bug in 
+            * Mac OS < 10.3. See #156446
+             */
+           buffer = g_malloc (bufsize + 6);
            errno = 0;
            
 #    ifdef HAVE_POSIX_GETPWUID_R