From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 8 May 2012 08:52:30 +0000 (+0000)
Subject: - workaround for  mantis 0002325
X-Git-Tag: initial-import-from-subversion-38251~13612
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b031bec53db1c264f6b67663719b536745ded7bd;p=oweals%2Fgnunet.git

- workaround for  mantis 0002325
---

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index f81b4c282..ca7251fec 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -593,12 +593,26 @@ GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
   if (GNUNET_NO == running)
     return;
 
-  aa = create_address(peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
+  aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
   old = find_exact_address (peer, aa);
   free_address (aa);
 
-  GNUNET_assert (old != NULL);
-  GNUNET_assert (old->used != in_use);
+  if (NULL == old)
+  {
+    GNUNET_break_op (0);
+    return;
+  }
+  if (old->used == in_use)
+  {
+    GNUNET_break_op (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Address in use called multiple times for peer `%s': %s -> %s \n",
+                GNUNET_i2s (peer),
+                (GNUNET_NO == old->used) ? "NO" : "YES",
+                (GNUNET_NO == in_use) ? "NO" : "YES");
+    return;
+  }
+
   old->used = in_use;
 
 #if HAVE_LIBGLPK