udp: fix leaks on EP destroy

nanomsg · Oct 7, 2024 · 6d59cbc · 6d59cbc
1 parent d59de52
commit 6d59cbc
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c
@@ -9,6 +9,7 @@
 #include "core/aio.h"
 #include "core/defs.h"
 #include "core/idhash.h"
+#include "core/message.h"
 #include "core/nng_impl.h"
 #include "core/options.h"
 #include "core/platform.h"
@@ -319,6 +320,7 @@ udp_pipe_destroy(udp_pipe *p)
 		nni_lmq_get(&p->rx_mq, &m);
 		nni_msg_free(m);
 	}
+	nni_lmq_fini(&p->rx_mq);
 	NNI_ASSERT(nni_list_empty(&p->rx_aios));
 
 	NNI_FREE_STRUCT(p);
@@ -1119,6 +1121,12 @@ udp_ep_rele(udp_ep *ep)
 	nni_aio_fini(&ep->resaio);
 	nni_aio_fini(&ep->tx_aio);
 	nni_aio_fini(&ep->rx_aio);
+
+	for (int i = 0; i < ep->tx_ring.size; i++) {
+		nni_msg_free(ep->tx_ring.descs[i].payload);
+		ep->tx_ring.descs[i].payload = NULL;
+	}
+	nni_msg_free(ep->rx_payload); // safe even if msg is null
 	nni_id_map_fini(&ep->pipes);
 	NNI_FREE_STRUCTS(ep->tx_ring.descs, ep->tx_ring.size);
 	NNI_FREE_STRUCT(ep);
@@ -1276,7 +1284,7 @@ udp_ep_init(udp_ep **epp, nng_url *url, nni_sock *sock)
 		ep->af = NNG_AF_INET;
 	} else if (strcmp(url->u_scheme, "udp6") == 0) {
 		ep->af = NNG_AF_INET6;
-        } else {
+	} else {
 		NNI_FREE_STRUCT(ep);
 		return (NNG_EADDRINVAL);
 	}