[GNUnet-SVN] r25612 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-12-21 03:32:55 +0100 (Fri, 21 Dec 2012)
New Revision: 25612

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/mesh_tunnel_tree.c
Log:
- fix

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-12-21 02:28:32 UTC (rev 
25611)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-12-21 02:32:55 UTC (rev 
25612)
@@ -5850,14 +5850,14 @@
                               1, GNUNET_NO);
     return GNUNET_OK;
   }
-  parent = tree_get_predecessor(t->tree);
+  parent = tree_get_predecessor (t->tree);
   pid = GNUNET_PEER_search (peer);
   if (pid != parent)
   {
     unsigned int nc;
 
     tree_del_peer (t->tree, pid, &tunnel_child_removed, t);
-    nc = tree_count_children(t->tree);
+    nc = tree_count_children (t->tree);
     if (nc > 0 || NULL != t->owner || t->nclients > 0)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

Modified: gnunet/src/mesh/mesh_tunnel_tree.c
===================================================================
--- gnunet/src/mesh/mesh_tunnel_tree.c  2012-12-21 02:28:32 UTC (rev 25611)
+++ gnunet/src/mesh/mesh_tunnel_tree.c  2012-12-21 02:32:55 UTC (rev 25612)
@@ -742,7 +742,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tree:   Deleting path to %s.\n",
               GNUNET_i2s (&id));
 #endif
-  if (peer_id == t->root->peer)
+  if (NULL == t->root || peer_id == t->root->peer)
     return NULL;
 
   for (n = t->disconnected_head; NULL != n; n = n->next)