From c35bbe84da19bc589785ceb4a0cf29de6c57fc21 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 24 Apr 2018 10:06:08 +0200
Subject: [PATCH] do not crash if service violates IPC protocol

---
 src/util/resolver_api.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index b92fd6a02..365b9960b 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -478,7 +478,15 @@ handle_response (void *cls,
   char *nret;
 
   (void) cls;
-  GNUNET_assert (NULL != rh);
+  if (NULL == rh)
+  {
+    /* Resolver service sent two replies to one query? Bad! */
+    GNUNET_break (0);
+    GNUNET_MQ_destroy (mq);
+    mq = NULL;
+    reconnect ();
+    return;
+  }
   size = ntohs (msg->size);
   if (size == sizeof (struct GNUNET_MessageHeader))
   {
-- 
2.25.1