Assert in _dbus_decompose_path if path is NULL or len is wrong
authorChristian Dywan <christian.dywan@lanedo.com>
Thu, 15 Jul 2010 11:18:33 +0000 (13:18 +0200)
committerWill Thompson <will.thompson@collabora.co.uk>
Fri, 16 Jul 2010 14:22:47 +0000 (15:22 +0100)
dbus/dbus-object-tree.c

index 5aab9e6..28cfc8b 100644 (file)
@@ -1080,6 +1080,7 @@ _dbus_decompose_path (const char*     data,
   int i, j, comp;
 
   _dbus_assert (data != NULL);
+  _dbus_assert (path != NULL);
   
 #if VERBOSE_DECOMPOSE
   _dbus_verbose ("Decomposing path \"%s\"\n",
@@ -1092,6 +1093,7 @@ _dbus_decompose_path (const char*     data,
       i = 0;
       while (i < len)
         {
+          _dbus_assert (data[i] != '\0');
           if (data[i] == '/')
             n_components += 1;
           ++i;