From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 31 Oct 2011 11:48:52 +0000 (+0000)
Subject: handle NULL better
X-Git-Tag: initial-import-from-subversion-38251~16142
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2b04b0ebddd5d221d2ce8452fb268edc6d477f2d;p=oweals%2Fgnunet.git

handle NULL better
---

diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index fd37bb85e..2e9917c3f 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -1503,21 +1503,23 @@ path_add_to_peer (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path)
   unsigned int l;
   unsigned int l2;
 
-#if MESH_DEBUG
-  struct GNUNET_PeerIdentity id;
-
-  GNUNET_PEER_resolve (peer_info->id, &id);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "MESH: adding path [%u] to peer %s\n",
-              path->length,
-              GNUNET_i2s (&id));
-#endif
-  if (NULL == peer_info || NULL == path)
+  if ((NULL == peer_info) || (NULL == path))
   {
     GNUNET_break (0);
     path_destroy (path);
     return;
   }
+#if MESH_DEBUG
+  { 
+    struct GNUNET_PeerIdentity id;
+    
+    GNUNET_PEER_resolve (peer_info->id, &id);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		"MESH: adding path [%u] to peer %s\n",
+		path->length,
+		GNUNET_i2s (&id));
+  }
+#endif
 
   l = path_get_length (path);
   if (0 == l)