[GNUnet-SVN] r34280 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2014-09-05 18:54:38 +0200 (Fri, 05 Sep 2014)
New Revision: 34280

Modified:
   gnunet/src/cadet/gnunet-service-cadet_peer.c
Log:
- check path length, simplify error conditions

Modified: gnunet/src/cadet/gnunet-service-cadet_peer.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_peer.c        2014-09-05 15:38:52 UTC 
(rev 34279)
+++ gnunet/src/cadet/gnunet-service-cadet_peer.c        2014-09-05 16:54:38 UTC 
(rev 34280)
@@ -1858,18 +1858,13 @@
   LOG (GNUNET_ERROR_TYPE_DEBUG, "adding path [%u] to peer %s\n",
        path->length, GCP_2s (peer));
 
-  if ((NULL == peer) || (NULL == path))
+  if (NULL == peer || NULL == path
+      || path->peers[path->length - 1] != peer->id)
   {
     GNUNET_break (0);
     path_destroy (path);
     return NULL;
   }
-  if (path->peers[path->length - 1] != peer->id)
-  {
-    GNUNET_break (0);
-    path_destroy (path);
-    return NULL;
-  }
 
   for (l = 1; l < path->length; l++)
   {
@@ -2010,7 +2005,8 @@
   {
     next = iter->next;
     if (0 == memcmp (path->peers, iter->peers,
-                     sizeof (GNUNET_PEER_Id) * path->length))
+                     sizeof (GNUNET_PEER_Id) * path->length)
+        && iter->length == path->length)
     {
       GNUNET_CONTAINER_DLL_remove (peer->path_head, peer->path_tail, iter);
       if (iter != path)