From 6a1d7478d76455ef6dacaf091e1ef8d24afea733 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 7 Nov 2004 06:29:58 +0000 Subject: [PATCH] Work around an bug in Mac OS < 10.3. (#156446, Dave MacLachlan) 2004-11-07 Matthias Clasen * glib/gutils.c (g_get_any_init): Work around an bug in Mac OS < 10.3. (#156446, Dave MacLachlan) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gutils.c | 5 ++++- 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 418d26577..ead6b15ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-07 Matthias Clasen + + * glib/gutils.c (g_get_any_init): Work around an bug + in Mac OS < 10.3. (#156446, Dave MacLachlan) + 2004-11-06 Tor Lillqvist * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 418d26577..ead6b15ed 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-11-07 Matthias Clasen + + * glib/gutils.c (g_get_any_init): Work around an bug + in Mac OS < 10.3. (#156446, Dave MacLachlan) + 2004-11-06 Tor Lillqvist * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 418d26577..ead6b15ed 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-11-07 Matthias Clasen + + * glib/gutils.c (g_get_any_init): Work around an bug + in Mac OS < 10.3. (#156446, Dave MacLachlan) + 2004-11-06 Tor Lillqvist * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 418d26577..ead6b15ed 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-11-07 Matthias Clasen + + * glib/gutils.c (g_get_any_init): Work around an bug + in Mac OS < 10.3. (#156446, Dave MacLachlan) + 2004-11-06 Tor Lillqvist * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 418d26577..ead6b15ed 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-11-07 Matthias Clasen + + * glib/gutils.c (g_get_any_init): Work around an bug + in Mac OS < 10.3. (#156446, Dave MacLachlan) + 2004-11-06 Tor Lillqvist * glibconfig.h.win32.in: Cosmetics: move the G_GNUC_INTERNAL diff --git a/glib/gutils.c b/glib/gutils.c index fef336112..9a3a16441 100644 --- 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