From ba2c00137dc64ecf96e6a21ed7569ba80055a9bb Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 12 Aug 2020 11:01:28 +0100
Subject: [PATCH] Fix client test leaks.

---
 test/lib/c/01-no-clean-session.c                   | 1 +
 test/lib/c/01-unpwd-set.c                          | 1 +
 test/lib/c/01-will-set.c                           | 1 +
 test/lib/c/01-will-unpwd-set.c                     | 1 +
 test/lib/c/02-subscribe-qos0.c                     | 1 +
 test/lib/c/02-subscribe-qos1-async1.c              | 1 +
 test/lib/c/02-subscribe-qos1-async2.c              | 1 +
 test/lib/c/02-subscribe-qos1.c                     | 1 +
 test/lib/c/02-subscribe-qos2.c                     | 1 +
 test/lib/c/02-unsubscribe-multiple-v5.c            | 1 +
 test/lib/c/02-unsubscribe-v5.c                     | 1 +
 test/lib/c/02-unsubscribe.c                        | 1 +
 test/lib/c/03-publish-b2c-qos1.c                   | 1 +
 test/lib/c/03-publish-b2c-qos2-len.c               | 1 +
 test/lib/c/03-publish-b2c-qos2.c                   | 1 +
 test/lib/c/03-publish-c2b-qos1-disconnect.c        | 1 +
 test/lib/c/03-publish-c2b-qos1-len.c               | 1 +
 test/lib/c/03-publish-c2b-qos1-receive-maximum.c   | 1 +
 test/lib/c/03-publish-c2b-qos2-disconnect.c        | 1 +
 test/lib/c/03-publish-c2b-qos2-len.c               | 1 +
 test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c     | 1 +
 test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c     | 1 +
 test/lib/c/03-publish-c2b-qos2-pubrec-error.c      | 1 +
 test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c | 1 +
 test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c | 1 +
 test/lib/c/03-publish-c2b-qos2.c                   | 1 +
 test/lib/c/03-publish-qos0-no-payload.c            | 1 +
 test/lib/c/03-publish-qos0.c                       | 1 +
 test/lib/c/03-request-response-1.c                 | 1 +
 test/lib/c/03-request-response-2.c                 | 1 +
 test/lib/c/03-request-response-correlation-1.c     | 1 +
 test/lib/c/04-retain-qos0.c                        | 1 +
 test/lib/c/08-ssl-bad-cacert.c                     | 1 +
 test/lib/c/08-ssl-connect-cert-auth-enc.c          | 1 +
 test/lib/c/08-ssl-connect-cert-auth.c              | 1 +
 test/lib/c/08-ssl-connect-no-auth.c                | 1 +
 test/lib/c/08-ssl-fake-cacert.c                    | 2 ++
 test/lib/c/09-util-topic-tokenise.c                | 8 ++++++++
 test/lib/c/11-prop-oversize-packet.c               | 1 +
 test/lib/c/11-prop-recv-qos0.c                     | 1 +
 test/lib/c/11-prop-recv-qos1.c                     | 1 +
 test/lib/c/11-prop-send-content-type.c             | 2 ++
 test/lib/c/11-prop-send-payload-format.c           | 2 ++
 test/lib/cpp/01-con-discon-success.cpp             | 1 +
 test/lib/cpp/01-keepalive-pingreq.cpp              | 1 +
 test/lib/cpp/01-no-clean-session.cpp               | 1 +
 test/lib/cpp/01-unpwd-set.cpp                      | 1 +
 test/lib/cpp/01-will-set.cpp                       | 1 +
 test/lib/cpp/01-will-unpwd-set.cpp                 | 1 +
 test/lib/cpp/02-subscribe-qos0.cpp                 | 1 +
 test/lib/cpp/02-subscribe-qos1.cpp                 | 1 +
 test/lib/cpp/02-subscribe-qos2.cpp                 | 1 +
 test/lib/cpp/02-unsubscribe.cpp                    | 1 +
 test/lib/cpp/03-publish-b2c-qos1.cpp               | 1 +
 test/lib/cpp/03-publish-b2c-qos2.cpp               | 1 +
 test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp    | 1 +
 test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp    | 1 +
 test/lib/cpp/03-publish-c2b-qos2.cpp               | 1 +
 test/lib/cpp/03-publish-qos0-no-payload.cpp        | 1 +
 test/lib/cpp/03-publish-qos0.cpp                   | 1 +
 test/lib/cpp/04-retain-qos0.cpp                    | 1 +
 test/lib/cpp/08-ssl-bad-cacert.cpp                 | 1 +
 test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp      | 1 +
 test/lib/cpp/08-ssl-connect-cert-auth.cpp          | 1 +
 test/lib/cpp/08-ssl-connect-no-auth.cpp            | 1 +
 test/lib/cpp/08-ssl-fake-cacert.cpp                | 2 ++
 test/lib/cpp/09-util-topic-tokenise.cpp            | 8 ++++++++
 67 files changed, 85 insertions(+)

diff --git a/test/lib/c/01-no-clean-session.c b/test/lib/c/01-no-clean-session.c
index d2b9a618..351f5f15 100644
--- a/test/lib/c/01-no-clean-session.c
+++ b/test/lib/c/01-no-clean-session.c
@@ -21,6 +21,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/01-unpwd-set.c b/test/lib/c/01-unpwd-set.c
index 4d1c244b..0ecc471f 100644
--- a/test/lib/c/01-unpwd-set.c
+++ b/test/lib/c/01-unpwd-set.c
@@ -22,6 +22,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/01-will-set.c b/test/lib/c/01-will-set.c
index 098cce70..266bdf2d 100644
--- a/test/lib/c/01-will-set.c
+++ b/test/lib/c/01-will-set.c
@@ -22,6 +22,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/01-will-unpwd-set.c b/test/lib/c/01-will-unpwd-set.c
index 94a64728..deb94721 100644
--- a/test/lib/c/01-will-unpwd-set.c
+++ b/test/lib/c/01-will-unpwd-set.c
@@ -23,6 +23,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/02-subscribe-qos0.c b/test/lib/c/02-subscribe-qos0.c
index cbaea3c5..c111fd01 100644
--- a/test/lib/c/02-subscribe-qos0.c
+++ b/test/lib/c/02-subscribe-qos0.c
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/02-subscribe-qos1-async1.c b/test/lib/c/02-subscribe-qos1-async1.c
index 4b7a500b..ea8b5a5b 100644
--- a/test/lib/c/02-subscribe-qos1-async1.c
+++ b/test/lib/c/02-subscribe-qos1-async1.c
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
 
 	mosquitto_disconnect(mosq);
 	mosquitto_loop_stop(mosq, false);
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/02-subscribe-qos1-async2.c b/test/lib/c/02-subscribe-qos1-async2.c
index 80cf70c6..98e2b20b 100644
--- a/test/lib/c/02-subscribe-qos1-async2.c
+++ b/test/lib/c/02-subscribe-qos1-async2.c
@@ -61,6 +61,7 @@ int main(int argc, char *argv[])
 
 	mosquitto_disconnect(mosq);
 	mosquitto_loop_stop(mosq, false);
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/02-subscribe-qos1.c b/test/lib/c/02-subscribe-qos1.c
index 757b1051..38cd6951 100644
--- a/test/lib/c/02-subscribe-qos1.c
+++ b/test/lib/c/02-subscribe-qos1.c
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/02-subscribe-qos2.c b/test/lib/c/02-subscribe-qos2.c
index 68660301..24a131c5 100644
--- a/test/lib/c/02-subscribe-qos2.c
+++ b/test/lib/c/02-subscribe-qos2.c
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/02-unsubscribe-multiple-v5.c b/test/lib/c/02-unsubscribe-multiple-v5.c
index 7403a633..208e4527 100644
--- a/test/lib/c/02-unsubscribe-multiple-v5.c
+++ b/test/lib/c/02-unsubscribe-multiple-v5.c
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/02-unsubscribe-v5.c b/test/lib/c/02-unsubscribe-v5.c
index 50e7377b..234d7581 100644
--- a/test/lib/c/02-unsubscribe-v5.c
+++ b/test/lib/c/02-unsubscribe-v5.c
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/02-unsubscribe.c b/test/lib/c/02-unsubscribe.c
index c757f510..d5cbffe0 100644
--- a/test/lib/c/02-unsubscribe.c
+++ b/test/lib/c/02-unsubscribe.c
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-b2c-qos1.c b/test/lib/c/03-publish-b2c-qos1.c
index f68ce555..be06fd0b 100644
--- a/test/lib/c/03-publish-b2c-qos1.c
+++ b/test/lib/c/03-publish-b2c-qos1.c
@@ -60,6 +60,7 @@ int main(int argc, char *argv[])
 	while(1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return 1;
diff --git a/test/lib/c/03-publish-b2c-qos2-len.c b/test/lib/c/03-publish-b2c-qos2-len.c
index 3975d914..c020631c 100644
--- a/test/lib/c/03-publish-b2c-qos2-len.c
+++ b/test/lib/c/03-publish-b2c-qos2-len.c
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 100, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-b2c-qos2.c b/test/lib/c/03-publish-b2c-qos2.c
index 3c2f340d..fbdff0dc 100644
--- a/test/lib/c/03-publish-b2c-qos2.c
+++ b/test/lib/c/03-publish-b2c-qos2.c
@@ -62,6 +62,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos1-disconnect.c b/test/lib/c/03-publish-c2b-qos1-disconnect.c
index 53238fbf..a24e9c5d 100644
--- a/test/lib/c/03-publish-c2b-qos1-disconnect.c
+++ b/test/lib/c/03-publish-c2b-qos1-disconnect.c
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos1-len.c b/test/lib/c/03-publish-c2b-qos1-len.c
index 66fe76e6..ed385956 100644
--- a/test/lib/c/03-publish-c2b-qos1-len.c
+++ b/test/lib/c/03-publish-c2b-qos1-len.c
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos1-receive-maximum.c b/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
index 5ef072a7..20e93ab2 100644
--- a/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
+++ b/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos2-disconnect.c b/test/lib/c/03-publish-c2b-qos2-disconnect.c
index 8de4f828..e9e11d39 100644
--- a/test/lib/c/03-publish-c2b-qos2-disconnect.c
+++ b/test/lib/c/03-publish-c2b-qos2-disconnect.c
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos2-len.c b/test/lib/c/03-publish-c2b-qos2-len.c
index ab59adb7..6c74b74d 100644
--- a/test/lib/c/03-publish-c2b-qos2-len.c
+++ b/test/lib/c/03-publish-c2b-qos2-len.c
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c b/test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c
index cfe7ab1d..67359d50 100644
--- a/test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c
+++ b/test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 50, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c b/test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c
index b4c0981e..699b4a51 100644
--- a/test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c
+++ b/test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 50, 1);
 	}
 	mosquitto_loop(mosq, 50, 1);
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos2-pubrec-error.c b/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
index f7a64b17..2459f8b7 100644
--- a/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
+++ b/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 100, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c b/test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c
index ab507986..bc5a4f16 100644
--- a/test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c
+++ b/test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c b/test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c
index ab507986..bc5a4f16 100644
--- a/test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c
+++ b/test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-c2b-qos2.c b/test/lib/c/03-publish-c2b-qos2.c
index ec58ba72..d17c8d6d 100644
--- a/test/lib/c/03-publish-c2b-qos2.c
+++ b/test/lib/c/03-publish-c2b-qos2.c
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, 300, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-qos0-no-payload.c b/test/lib/c/03-publish-qos0-no-payload.c
index b63130fa..8fbc7854 100644
--- a/test/lib/c/03-publish-qos0-no-payload.c
+++ b/test/lib/c/03-publish-qos0-no-payload.c
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-publish-qos0.c b/test/lib/c/03-publish-qos0.c
index 5d4a2464..6c49ffd6 100644
--- a/test/lib/c/03-publish-qos0.c
+++ b/test/lib/c/03-publish-qos0.c
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-request-response-1.c b/test/lib/c/03-request-response-1.c
index 1cdd4079..b1896db5 100644
--- a/test/lib/c/03-request-response-1.c
+++ b/test/lib/c/03-request-response-1.c
@@ -55,6 +55,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-request-response-2.c b/test/lib/c/03-request-response-2.c
index 3419f395..a7c11b9f 100644
--- a/test/lib/c/03-request-response-2.c
+++ b/test/lib/c/03-request-response-2.c
@@ -60,6 +60,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/03-request-response-correlation-1.c b/test/lib/c/03-request-response-correlation-1.c
index 35190af5..9629c7a7 100644
--- a/test/lib/c/03-request-response-correlation-1.c
+++ b/test/lib/c/03-request-response-correlation-1.c
@@ -56,6 +56,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/04-retain-qos0.c b/test/lib/c/04-retain-qos0.c
index aa1b54fa..8b2fced3 100644
--- a/test/lib/c/04-retain-qos0.c
+++ b/test/lib/c/04-retain-qos0.c
@@ -32,6 +32,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/08-ssl-bad-cacert.c b/test/lib/c/08-ssl-bad-cacert.c
index d32a8dd0..b7291221 100644
--- a/test/lib/c/08-ssl-bad-cacert.c
+++ b/test/lib/c/08-ssl-bad-cacert.c
@@ -15,6 +15,7 @@ int main(int argc, char *argv[])
 	if(mosquitto_tls_set(mosq, "this/file/doesnt/exist", NULL, NULL, NULL, NULL) == MOSQ_ERR_INVAL){
 		rc = 0;
 	}
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return rc;
 }
diff --git a/test/lib/c/08-ssl-connect-cert-auth-enc.c b/test/lib/c/08-ssl-connect-cert-auth-enc.c
index e75f2f33..b88f6f30 100644
--- a/test/lib/c/08-ssl-connect-cert-auth-enc.c
+++ b/test/lib/c/08-ssl-connect-cert-auth-enc.c
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/08-ssl-connect-cert-auth.c b/test/lib/c/08-ssl-connect-cert-auth.c
index 58f7da0f..e101e0d1 100644
--- a/test/lib/c/08-ssl-connect-cert-auth.c
+++ b/test/lib/c/08-ssl-connect-cert-auth.c
@@ -39,6 +39,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/08-ssl-connect-no-auth.c b/test/lib/c/08-ssl-connect-no-auth.c
index 677cea4e..4b5024b6 100644
--- a/test/lib/c/08-ssl-connect-no-auth.c
+++ b/test/lib/c/08-ssl-connect-no-auth.c
@@ -39,6 +39,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/08-ssl-fake-cacert.c b/test/lib/c/08-ssl-fake-cacert.c
index b866d5d2..1dc05d8c 100644
--- a/test/lib/c/08-ssl-fake-cacert.c
+++ b/test/lib/c/08-ssl-fake-cacert.c
@@ -27,6 +27,8 @@ int main(int argc, char *argv[])
 	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
 	rc = mosquitto_loop_forever(mosq, -1, 1);
+	mosquitto_destroy(mosq);
+	mosquitto_lib_cleanup();
 	if(rc == MOSQ_ERR_ERRNO && errno == EPROTO){
 		return 0;
 	}else{
diff --git a/test/lib/c/09-util-topic-tokenise.c b/test/lib/c/09-util-topic-tokenise.c
index 24baf07f..39e335d3 100644
--- a/test/lib/c/09-util-topic-tokenise.c
+++ b/test/lib/c/09-util-topic-tokenise.c
@@ -30,6 +30,7 @@ int main(int argc, char *argv[])
 		print_error("topic", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("a/deep/topic/hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -43,6 +44,7 @@ int main(int argc, char *argv[])
 		print_error("a/deep/topic/hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("/a/deep/topic/hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -57,6 +59,7 @@ int main(int argc, char *argv[])
 		print_error("/a/deep/topic/hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("a/b/c", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -69,6 +72,7 @@ int main(int argc, char *argv[])
 		print_error("a/b/c", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("/a/b/c", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -82,6 +86,7 @@ int main(int argc, char *argv[])
 		print_error("/a/b/c", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("a///hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -95,6 +100,7 @@ int main(int argc, char *argv[])
 		print_error("a///hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("/a///hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -109,6 +115,7 @@ int main(int argc, char *argv[])
 		print_error("/a///hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosquitto_sub_topic_tokenise("/a///hierarchy/", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -124,6 +131,7 @@ int main(int argc, char *argv[])
 		print_error("/a///hierarchy/", topics, topic_count);
 		return 1;
 	}
+	mosquitto_sub_topic_tokens_free(&topics, topic_count);
 
 	return 0;
 }
diff --git a/test/lib/c/11-prop-oversize-packet.c b/test/lib/c/11-prop-oversize-packet.c
index c96526f5..eff0082e 100644
--- a/test/lib/c/11-prop-oversize-packet.c
+++ b/test/lib/c/11-prop-oversize-packet.c
@@ -66,6 +66,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/11-prop-recv-qos0.c b/test/lib/c/11-prop-recv-qos0.c
index 257bc549..b430998f 100644
--- a/test/lib/c/11-prop-recv-qos0.c
+++ b/test/lib/c/11-prop-recv-qos0.c
@@ -75,6 +75,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/11-prop-recv-qos1.c b/test/lib/c/11-prop-recv-qos1.c
index e3db7745..2fe38681 100644
--- a/test/lib/c/11-prop-recv-qos1.c
+++ b/test/lib/c/11-prop-recv-qos1.c
@@ -75,6 +75,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/11-prop-send-content-type.c b/test/lib/c/11-prop-send-content-type.c
index d60c8b5a..de18d2b8 100644
--- a/test/lib/c/11-prop-send-content-type.c
+++ b/test/lib/c/11-prop-send-content-type.c
@@ -18,6 +18,7 @@ void on_connect(struct mosquitto *mosq, void *obj, int rc)
 	}else{
 		rc2 = mosquitto_property_add_string(&proplist, MQTT_PROP_CONTENT_TYPE, "application/json");
 		mosquitto_publish_v5(mosq, &sent_mid, "prop/qos0", strlen("message"), "message", 0, false, proplist);
+		mosquitto_property_free_all(&proplist);
 	}
 }
 
@@ -52,6 +53,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/c/11-prop-send-payload-format.c b/test/lib/c/11-prop-send-payload-format.c
index 516d86d4..2d2cd82e 100644
--- a/test/lib/c/11-prop-send-payload-format.c
+++ b/test/lib/c/11-prop-send-payload-format.c
@@ -18,6 +18,7 @@ void on_connect(struct mosquitto *mosq, void *obj, int rc)
 	}else{
 		rc2 = mosquitto_property_add_byte(&proplist, MQTT_PROP_PAYLOAD_FORMAT_INDICATOR, 1);
 		mosquitto_publish_v5(mosq, &sent_mid, "prop/qos0", strlen("message"), "message", 0, false, proplist);
+		mosquitto_property_free_all(&proplist);
 	}
 }
 
@@ -52,6 +53,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
+	mosquitto_destroy(mosq);
 
 	mosquitto_lib_cleanup();
 	return run;
diff --git a/test/lib/cpp/01-con-discon-success.cpp b/test/lib/cpp/01-con-discon-success.cpp
index 82cc8b4f..45dedb78 100644
--- a/test/lib/cpp/01-con-discon-success.cpp
+++ b/test/lib/cpp/01-con-discon-success.cpp
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/01-keepalive-pingreq.cpp b/test/lib/cpp/01-keepalive-pingreq.cpp
index 677066b2..3f169a45 100644
--- a/test/lib/cpp/01-keepalive-pingreq.cpp
+++ b/test/lib/cpp/01-keepalive-pingreq.cpp
@@ -36,6 +36,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/01-no-clean-session.cpp b/test/lib/cpp/01-no-clean-session.cpp
index 0a6f4987..40eb7e5d 100644
--- a/test/lib/cpp/01-no-clean-session.cpp
+++ b/test/lib/cpp/01-no-clean-session.cpp
@@ -28,6 +28,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/01-unpwd-set.cpp b/test/lib/cpp/01-unpwd-set.cpp
index 24e53f43..b34f0b3d 100644
--- a/test/lib/cpp/01-unpwd-set.cpp
+++ b/test/lib/cpp/01-unpwd-set.cpp
@@ -29,6 +29,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/01-will-set.cpp b/test/lib/cpp/01-will-set.cpp
index 1b9f7132..97c78352 100644
--- a/test/lib/cpp/01-will-set.cpp
+++ b/test/lib/cpp/01-will-set.cpp
@@ -32,6 +32,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/01-will-unpwd-set.cpp b/test/lib/cpp/01-will-unpwd-set.cpp
index f3ee1fe5..e0da1e64 100644
--- a/test/lib/cpp/01-will-unpwd-set.cpp
+++ b/test/lib/cpp/01-will-unpwd-set.cpp
@@ -30,6 +30,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/02-subscribe-qos0.cpp b/test/lib/cpp/02-subscribe-qos0.cpp
index 5a1582bc..2d6db7ed 100644
--- a/test/lib/cpp/02-subscribe-qos0.cpp
+++ b/test/lib/cpp/02-subscribe-qos0.cpp
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/02-subscribe-qos1.cpp b/test/lib/cpp/02-subscribe-qos1.cpp
index 3b53bf22..7ad76b64 100644
--- a/test/lib/cpp/02-subscribe-qos1.cpp
+++ b/test/lib/cpp/02-subscribe-qos1.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/02-subscribe-qos2.cpp b/test/lib/cpp/02-subscribe-qos2.cpp
index 3b2d1116..5572960e 100644
--- a/test/lib/cpp/02-subscribe-qos2.cpp
+++ b/test/lib/cpp/02-subscribe-qos2.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/02-unsubscribe.cpp b/test/lib/cpp/02-unsubscribe.cpp
index 80df9344..9b780452 100644
--- a/test/lib/cpp/02-unsubscribe.cpp
+++ b/test/lib/cpp/02-unsubscribe.cpp
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/03-publish-b2c-qos1.cpp b/test/lib/cpp/03-publish-b2c-qos1.cpp
index d7e3cb24..e5f17bc5 100644
--- a/test/lib/cpp/03-publish-b2c-qos1.cpp
+++ b/test/lib/cpp/03-publish-b2c-qos1.cpp
@@ -70,6 +70,7 @@ int main(int argc, char *argv[])
 	while(1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/03-publish-b2c-qos2.cpp b/test/lib/cpp/03-publish-b2c-qos2.cpp
index a4feeed9..a949ea59 100644
--- a/test/lib/cpp/03-publish-b2c-qos2.cpp
+++ b/test/lib/cpp/03-publish-b2c-qos2.cpp
@@ -72,6 +72,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp b/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
index c17eae12..c84a9fd0 100644
--- a/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp
@@ -62,6 +62,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp b/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
index 96991f24..8a229c10 100644
--- a/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp
@@ -62,6 +62,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/03-publish-c2b-qos2.cpp b/test/lib/cpp/03-publish-c2b-qos2.cpp
index 9fe606e8..6187b77f 100644
--- a/test/lib/cpp/03-publish-c2b-qos2.cpp
+++ b/test/lib/cpp/03-publish-c2b-qos2.cpp
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/03-publish-qos0-no-payload.cpp b/test/lib/cpp/03-publish-qos0-no-payload.cpp
index acd97e05..a0b7fcce 100644
--- a/test/lib/cpp/03-publish-qos0-no-payload.cpp
+++ b/test/lib/cpp/03-publish-qos0-no-payload.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/03-publish-qos0.cpp b/test/lib/cpp/03-publish-qos0.cpp
index fba30baa..c722cb9a 100644
--- a/test/lib/cpp/03-publish-qos0.cpp
+++ b/test/lib/cpp/03-publish-qos0.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/04-retain-qos0.cpp b/test/lib/cpp/04-retain-qos0.cpp
index 6b7b61ee..c8bfe855 100644
--- a/test/lib/cpp/04-retain-qos0.cpp
+++ b/test/lib/cpp/04-retain-qos0.cpp
@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/08-ssl-bad-cacert.cpp b/test/lib/cpp/08-ssl-bad-cacert.cpp
index b54d4fc5..d6367d7c 100644
--- a/test/lib/cpp/08-ssl-bad-cacert.cpp
+++ b/test/lib/cpp/08-ssl-bad-cacert.cpp
@@ -25,6 +25,7 @@ int main(int argc, char *argv[])
 	if(mosq->tls_set("this/file/doesnt/exist") == MOSQ_ERR_INVAL){
 		rc = 0;
 	}
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return rc;
diff --git a/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp b/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp
index 55d8bc73..e6247611 100644
--- a/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp
+++ b/test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp
@@ -57,6 +57,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/08-ssl-connect-cert-auth.cpp b/test/lib/cpp/08-ssl-connect-cert-auth.cpp
index 8e041510..a26c9867 100644
--- a/test/lib/cpp/08-ssl-connect-cert-auth.cpp
+++ b/test/lib/cpp/08-ssl-connect-cert-auth.cpp
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/08-ssl-connect-no-auth.cpp b/test/lib/cpp/08-ssl-connect-no-auth.cpp
index cfa0402f..4c86e199 100644
--- a/test/lib/cpp/08-ssl-connect-no-auth.cpp
+++ b/test/lib/cpp/08-ssl-connect-no-auth.cpp
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	while(run == -1){
 		mosq->loop();
 	}
+	delete mosq;
 
 	mosqpp::lib_cleanup();
 
diff --git a/test/lib/cpp/08-ssl-fake-cacert.cpp b/test/lib/cpp/08-ssl-fake-cacert.cpp
index d4aa0dda..2634a1e7 100644
--- a/test/lib/cpp/08-ssl-fake-cacert.cpp
+++ b/test/lib/cpp/08-ssl-fake-cacert.cpp
@@ -36,6 +36,8 @@ int main(int argc, char *argv[])
 	mosq->connect("localhost", port, 60);
 
 	rc = mosq->loop_forever();
+	delete mosq;
+	mosqpp::lib_cleanup();
 	if(rc == MOSQ_ERR_ERRNO && errno == EPROTO){
 		return 0;
 	}else{
diff --git a/test/lib/cpp/09-util-topic-tokenise.cpp b/test/lib/cpp/09-util-topic-tokenise.cpp
index 3094d29d..469994d2 100644
--- a/test/lib/cpp/09-util-topic-tokenise.cpp
+++ b/test/lib/cpp/09-util-topic-tokenise.cpp
@@ -29,6 +29,7 @@ int main(int argc, char *argv[])
 		print_error("topic", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("a/deep/topic/hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -42,6 +43,7 @@ int main(int argc, char *argv[])
 		print_error("a/deep/topic/hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("/a/deep/topic/hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -56,6 +58,7 @@ int main(int argc, char *argv[])
 		print_error("/a/deep/topic/hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("a/b/c", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -68,6 +71,7 @@ int main(int argc, char *argv[])
 		print_error("a/b/c", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("/a/b/c", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -81,6 +85,7 @@ int main(int argc, char *argv[])
 		print_error("/a/b/c", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("a///hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -94,6 +99,7 @@ int main(int argc, char *argv[])
 		print_error("a///hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("/a///hierarchy", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -108,6 +114,7 @@ int main(int argc, char *argv[])
 		print_error("/a///hierarchy", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	if(mosqpp::sub_topic_tokenise("/a///hierarchy/", &topics, &topic_count)){
 		printf("Out of memory.\n");
@@ -123,6 +130,7 @@ int main(int argc, char *argv[])
 		print_error("/a///hierarchy/", topics, topic_count);
 		return 1;
 	}
+	mosqpp::sub_topic_tokens_free(&topics, topic_count);
 
 	return 0;
 }