From: Bart Polot <bart.polot+voyager@gmail.com>
Date: Tue, 31 Jan 2017 03:22:07 +0000 (+0100)
Subject: Fix free of NULL pointer
X-Git-Tag: taler-0.2.1~231
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7a469336dc169173558720df45c03a76bf50e140;p=oweals%2Fgnunet.git

Fix free of NULL pointer
---

diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 3eaa78af8..e00203b25 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -1724,13 +1724,15 @@ GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p)
 {
   struct GNUNET_CADET_PortMessage *msg;
   struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_HashCode *id;
 
   env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE);
 
-  msg->port = *p->hash;
+  id = NULL != p->hash ? p->hash : &p->id;
+  msg->port = *id;
   GNUNET_MQ_send (p->cadet->mq, env);
-  GNUNET_CONTAINER_multihashmap_remove (p->cadet->ports, p->hash, p);
-  GNUNET_free (p->hash);
+  GNUNET_CONTAINER_multihashmap_remove (p->cadet->ports, id, p);
+  GNUNET_free_non_null (p->hash);
   GNUNET_free (p);
 }