diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dbus/dbus-object-tree.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2006-08-03 John (J5) Palmieri <johnp@redhat.com> + + * dbus/dbus-object-tree.c: Patch by Benjamin Otte + <in7y118 at public.uni-hamburg dot de> - fix invalid + read/write reported by valgrind + 2006-07-24 John (J5) Palmieri <johnp@redhat.com> * Released 0.91 diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c index 407ba6dc..27dc5f17 100644 --- a/dbus/dbus-object-tree.c +++ b/dbus/dbus-object-tree.c @@ -935,7 +935,7 @@ allocate_subtree_object (const char *name) len = strlen (name); - subtree = dbus_malloc (front_padding + (len + 1)); + subtree = dbus_malloc (MAX (front_padding + (len + 1), sizeof (DBusObjectSubtree))); if (subtree == NULL) return NULL; |