dbus/dbus dbus-object-tree.c,1.18,1.19

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv19687/dbus

Modified Files:
	dbus-object-tree.c 
Log Message:
* dbus/dbus-object-tree.c: Patch by Benjamin Otte 
  <in7y118 at public.uni-hamburg dot de> - fix invalid
  read/write reported by valgrind


Index: dbus-object-tree.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-object-tree.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dbus-object-tree.c	5 Sep 2005 19:37:19 -0000	1.18
+++ dbus-object-tree.c	3 Aug 2006 20:02:37 -0000	1.19
@@ -935,7 +935,7 @@
 
   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;