Fix memory leaks only in tests.

test/lib/c/02-subscribe-qos2.c

@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/02-unsubscribe.c

@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-b2c-qos2-len.c

@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 100, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c

@@ -67,6 +67,7 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-b2c-qos2.c

@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-c2b-qos1-len.c

@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-c2b-qos1-receive-maximum.c

@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-c2b-qos2-len.c

@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-c2b-qos2-maximum-qos-0.c

@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 50, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-c2b-qos2-maximum-qos-1.c

@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 	}
 	mosquitto_loop(mosq, 50, 1);
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-c2b-qos2-pubrec-error.c

@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 100, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-c2b-qos2-receive-maximum-1.c

@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-c2b-qos2-receive-maximum-2.c

@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosquitto_loop(mosq, 300, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-publish-qos0.c

@@ -45,6 +45,7 @@ int main(int argc, char *argv[])
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

test/lib/c/03-request-response-2.c

@@ -61,6 +61,7 @@ int main(int argc, char *argv[])
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

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;
 }

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;
 }

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);
 	}
 }
 
@@ -53,6 +54,7 @@ int main(int argc, char *argv[])
 		rc = mosquitto_loop(mosq, -1, 1);
 	}
 
+	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
 	return run;
 }

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);
 	}
 }
 

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();
 

test/lib/cpp/01-keepalive-pingreq.cpp

@@ -37,6 +37,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/01-no-clean-session.cpp

@@ -29,6 +29,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/01-unpwd-set.cpp

@@ -30,6 +30,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/01-will-set.cpp

@@ -33,6 +33,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/01-will-unpwd-set.cpp

@@ -31,6 +31,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/02-subscribe-qos0.cpp

@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/02-subscribe-qos1.cpp

@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/02-subscribe-qos2.cpp

@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/03-publish-b2c-qos1.cpp

@@ -71,6 +71,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return 1;

test/lib/cpp/03-publish-b2c-qos2.cpp

@@ -73,6 +73,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/03-publish-c2b-qos1-disconnect.cpp

@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/03-publish-c2b-qos2-disconnect.cpp

@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/03-publish-c2b-qos2.cpp

@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/03-publish-qos0-no-payload.cpp

@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/03-publish-qos0.cpp

@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/04-retain-qos0.cpp

@@ -41,6 +41,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

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;

test/lib/cpp/08-ssl-connect-cert-auth-enc.cpp

@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/08-ssl-connect-cert-auth.cpp

@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/08-ssl-connect-no-auth.cpp

@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 		mosq->loop();
 	}
 
+	delete mosq;
 	mosqpp::lib_cleanup();
 
 	return run;

test/lib/cpp/08-ssl-fake-cacert.cpp

@@ -36,6 +36,7 @@ int main(int argc, char *argv[])
 	mosq->connect("localhost", port, 60);
 
 	rc = mosq->loop_forever();
+	delete mosq;
 	if(rc == MOSQ_ERR_ERRNO && errno == EPROTO){
 		return 0;
 	}else{

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;
 }