ri Oct 27 05:35:14 2000 Tim Janik <timj@gtk.org>

* gobject.c (g_object_watch_closure): fixed realloc bug, reported
                by havoc.
This commit is contained in:
Tim Janik 2000-10-27 04:19:34 +00:00
parent 8a572c0da1
commit 1e23d8a9bc
2 changed files with 5 additions and 1 deletions

View File

@ -1,5 +1,8 @@
Fri Oct 27 05:35:14 2000 Tim Janik <timj@gtk.org>
* gobject.c (g_object_watch_closure): fixed realloc bug, reported
by havoc.
* gsignal.c (g_signal_newv): fixed deadlock scenarion where
g_signal_lookup() would be called with the signal lock being
held. reported by james henstridge.

View File

@ -960,7 +960,7 @@ g_object_watch_closure (GObject *object,
g_closure_add_marshal_guards (closure,
object, (GClosureNotify) g_object_ref,
object, (GClosureNotify) g_object_unref);
carray = g_object_get_qdata (object, quark_closure_array);
carray = g_object_steal_qdata (object, quark_closure_array);
if (!carray)
{
carray = g_renew (CArray, NULL, 1);
@ -975,6 +975,7 @@ g_object_watch_closure (GObject *object,
carray = g_realloc (carray, sizeof (*carray) + sizeof (carray->closures[0]) * i);
carray->closures[i] = closure;
g_object_set_qdata_full (object, quark_closure_array, carray, destroy_closure_array);
}
}