From 7a469336dc169173558720df45c03a76bf50e140 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Tue, 31 Jan 2017 04:22:07 +0100 Subject: [PATCH] Fix free of NULL pointer --- src/cadet/cadet_api.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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); } -- 2.25.1