From ed28c416e98e981ad73870fafa4de950f18fc719 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Tue, 1 Dec 2020 09:48:11 +0000
Subject: [PATCH] Null checks in client tests.

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

diff --git a/test/lib/c/01-con-discon-success.c b/test/lib/c/01-con-discon-success.c
index 5f17e80f..0f03a82f 100644
--- a/test/lib/c/01-con-discon-success.c
+++ b/test/lib/c/01-con-discon-success.c
@@ -29,6 +29,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-con-discon-success", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 
diff --git a/test/lib/c/01-keepalive-pingreq.c b/test/lib/c/01-keepalive-pingreq.c
index ea62089f..8b290686 100644
--- a/test/lib/c/01-keepalive-pingreq.c
+++ b/test/lib/c/01-keepalive-pingreq.c
@@ -22,12 +22,17 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-keepalive-pingreq", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 
 	rc = mosquitto_connect(mosq, "localhost", port, 5);
+	if(rc != 0) return rc;
 
 	while(run == -1){
-		mosquitto_loop(mosq, -1, 1);
+		rc = mosquitto_loop(mosq, -1, 1);
+		if(rc != 0) break;
 	}
 
 	mosquitto_destroy(mosq);
diff --git a/test/lib/c/01-no-clean-session.c b/test/lib/c/01-no-clean-session.c
index 351f5f15..21501494 100644
--- a/test/lib/c/01-no-clean-session.c
+++ b/test/lib/c/01-no-clean-session.c
@@ -15,6 +15,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-no-clean-session", false, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 
 	rc = mosquitto_connect(mosq, "localhost", port, 60);
 
diff --git a/test/lib/c/01-server-keepalive-pingreq.c b/test/lib/c/01-server-keepalive-pingreq.c
index 99da6f69..6e4eaaba 100644
--- a/test/lib/c/01-server-keepalive-pingreq.c
+++ b/test/lib/c/01-server-keepalive-pingreq.c
@@ -22,6 +22,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-server-keepalive-pingreq", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 
diff --git a/test/lib/c/01-unpwd-set.c b/test/lib/c/01-unpwd-set.c
index 0ecc471f..9a16acaf 100644
--- a/test/lib/c/01-unpwd-set.c
+++ b/test/lib/c/01-unpwd-set.c
@@ -15,6 +15,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-unpwd-set", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_username_pw_set(mosq, "uname", ";'[08gn=#");
 
 	rc = mosquitto_connect(mosq, "localhost", port, 60);
diff --git a/test/lib/c/01-will-set.c b/test/lib/c/01-will-set.c
index 266bdf2d..bf166a28 100644
--- a/test/lib/c/01-will-set.c
+++ b/test/lib/c/01-will-set.c
@@ -15,6 +15,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-will-set", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_will_set(mosq, "topic/on/unexpected/disconnect", strlen("will message"), "will message", 1, true);
 
 	rc = mosquitto_connect(mosq, "localhost", port, 60);
diff --git a/test/lib/c/01-will-unpwd-set.c b/test/lib/c/01-will-unpwd-set.c
index deb94721..8169954e 100644
--- a/test/lib/c/01-will-unpwd-set.c
+++ b/test/lib/c/01-will-unpwd-set.c
@@ -15,6 +15,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("01-will-unpwd-set", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_username_pw_set(mosq, "oibvvwqw", "#'^2hg9a&nm38*us");
 	mosquitto_will_set(mosq, "will-topic", strlen("will message"), "will message", 2, false);
 
diff --git a/test/lib/c/02-subscribe-qos0.c b/test/lib/c/02-subscribe-qos0.c
index c111fd01..55897328 100644
--- a/test/lib/c/02-subscribe-qos0.c
+++ b/test/lib/c/02-subscribe-qos0.c
@@ -34,6 +34,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("subscribe-qos0-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
diff --git a/test/lib/c/02-subscribe-qos1-async1.c b/test/lib/c/02-subscribe-qos1-async1.c
index ea8b5a5b..8e76e881 100644
--- a/test/lib/c/02-subscribe-qos1-async1.c
+++ b/test/lib/c/02-subscribe-qos1-async1.c
@@ -39,6 +39,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("subscribe-qos1-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
diff --git a/test/lib/c/02-subscribe-qos1-async2.c b/test/lib/c/02-subscribe-qos1-async2.c
index 98e2b20b..8339eaac 100644
--- a/test/lib/c/02-subscribe-qos1-async2.c
+++ b/test/lib/c/02-subscribe-qos1-async2.c
@@ -39,6 +39,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("subscribe-qos1-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
diff --git a/test/lib/c/02-subscribe-qos1.c b/test/lib/c/02-subscribe-qos1.c
index 38cd6951..e072aada 100644
--- a/test/lib/c/02-subscribe-qos1.c
+++ b/test/lib/c/02-subscribe-qos1.c
@@ -34,6 +34,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("subscribe-qos1-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
diff --git a/test/lib/c/02-subscribe-qos2.c b/test/lib/c/02-subscribe-qos2.c
index ceb416c9..dd1589eb 100644
--- a/test/lib/c/02-subscribe-qos2.c
+++ b/test/lib/c/02-subscribe-qos2.c
@@ -34,6 +34,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("subscribe-qos2-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
diff --git a/test/lib/c/02-unsubscribe-multiple-v5.c b/test/lib/c/02-unsubscribe-multiple-v5.c
index 208e4527..8ac16fb8 100644
--- a/test/lib/c/02-unsubscribe-multiple-v5.c
+++ b/test/lib/c/02-unsubscribe-multiple-v5.c
@@ -42,6 +42,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("unsubscribe-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
diff --git a/test/lib/c/02-unsubscribe-v5.c b/test/lib/c/02-unsubscribe-v5.c
index 234d7581..3acb6f0f 100644
--- a/test/lib/c/02-unsubscribe-v5.c
+++ b/test/lib/c/02-unsubscribe-v5.c
@@ -34,6 +34,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("unsubscribe-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
diff --git a/test/lib/c/02-unsubscribe.c b/test/lib/c/02-unsubscribe.c
index 6b28f217..95003c52 100644
--- a/test/lib/c/02-unsubscribe.c
+++ b/test/lib/c/02-unsubscribe.c
@@ -34,6 +34,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("unsubscribe-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_unsubscribe_callback_set(mosq, on_unsubscribe);
diff --git a/test/lib/c/03-publish-b2c-qos1-unexpected-puback.c b/test/lib/c/03-publish-b2c-qos1-unexpected-puback.c
index 688b0907..adc34f0e 100644
--- a/test/lib/c/03-publish-b2c-qos1-unexpected-puback.c
+++ b/test/lib/c/03-publish-b2c-qos1-unexpected-puback.c
@@ -24,6 +24,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos1-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 
 	rc = mosquitto_connect(mosq, "localhost", port, 5);
diff --git a/test/lib/c/03-publish-b2c-qos1.c b/test/lib/c/03-publish-b2c-qos1.c
index be06fd0b..5e6858e6 100644
--- a/test/lib/c/03-publish-b2c-qos1.c
+++ b/test/lib/c/03-publish-b2c-qos1.c
@@ -51,6 +51,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos1-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_message_callback_set(mosq, on_message);
 	mosquitto_message_retry_set(mosq, 3);
diff --git a/test/lib/c/03-publish-b2c-qos2-len.c b/test/lib/c/03-publish-b2c-qos2-len.c
index b5a7f49c..e3d2d5a3 100644
--- a/test/lib/c/03-publish-b2c-qos2-len.c
+++ b/test/lib/c/03-publish-b2c-qos2-len.c
@@ -58,6 +58,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
diff --git a/test/lib/c/03-publish-b2c-qos2-unexpected-pubcomp.c b/test/lib/c/03-publish-b2c-qos2-unexpected-pubcomp.c
index 414c181c..9616b494 100644
--- a/test/lib/c/03-publish-b2c-qos2-unexpected-pubcomp.c
+++ b/test/lib/c/03-publish-b2c-qos2-unexpected-pubcomp.c
@@ -24,6 +24,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 
 	rc = mosquitto_connect(mosq, "localhost", port, 5);
diff --git a/test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c b/test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c
index 467d9b23..9055f4d4 100644
--- a/test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c
+++ b/test/lib/c/03-publish-b2c-qos2-unexpected-pubrel.c
@@ -56,6 +56,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_message_callback_set(mosq, on_message);
 	mosquitto_message_retry_set(mosq, 5);
diff --git a/test/lib/c/03-publish-b2c-qos2.c b/test/lib/c/03-publish-b2c-qos2.c
index 2345b6b5..17f47fb4 100644
--- a/test/lib/c/03-publish-b2c-qos2.c
+++ b/test/lib/c/03-publish-b2c-qos2.c
@@ -53,6 +53,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_message_callback_set(mosq, on_message);
 	mosquitto_message_retry_set(mosq, 5);
diff --git a/test/lib/c/03-publish-c2b-qos1-disconnect.c b/test/lib/c/03-publish-c2b-qos1-disconnect.c
index a24e9c5d..c293b916 100644
--- a/test/lib/c/03-publish-c2b-qos1-disconnect.c
+++ b/test/lib/c/03-publish-c2b-qos1-disconnect.c
@@ -43,6 +43,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos1-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_publish_callback_set(mosq, on_publish);
diff --git a/test/lib/c/03-publish-c2b-qos1-len.c b/test/lib/c/03-publish-c2b-qos1-len.c
index fb3ae056..c1dda830 100644
--- a/test/lib/c/03-publish-c2b-qos1-len.c
+++ b/test/lib/c/03-publish-c2b-qos1-len.c
@@ -35,6 +35,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos1-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
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 bfbbd529..d1865f42 100644
--- a/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
+++ b/test/lib/c/03-publish-c2b-qos1-receive-maximum.c
@@ -38,6 +38,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos1-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 
 	mosquitto_connect_v5_callback_set(mosq, on_connect);
diff --git a/test/lib/c/03-publish-c2b-qos2-disconnect.c b/test/lib/c/03-publish-c2b-qos2-disconnect.c
index e9e11d39..70883106 100644
--- a/test/lib/c/03-publish-c2b-qos2-disconnect.c
+++ b/test/lib/c/03-publish-c2b-qos2-disconnect.c
@@ -43,6 +43,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_publish_callback_set(mosq, on_publish);
diff --git a/test/lib/c/03-publish-c2b-qos2-len.c b/test/lib/c/03-publish-c2b-qos2-len.c
index 1b2eb2e5..e4c74c76 100644
--- a/test/lib/c/03-publish-c2b-qos2-len.c
+++ b/test/lib/c/03-publish-c2b-qos2-len.c
@@ -35,6 +35,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
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 49049ac6..81480bd1 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
@@ -42,6 +42,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
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 0f7c4eb6..95451454 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
@@ -42,6 +42,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
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 170ee842..1e553198 100644
--- a/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
+++ b/test/lib/c/03-publish-c2b-qos2-pubrec-error.c
@@ -33,6 +33,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 
 	mosquitto_connect_v5_callback_set(mosq, on_connect);
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 1d49b271..a7926dad 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
@@ -38,6 +38,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 
 	mosquitto_connect_v5_callback_set(mosq, on_connect);
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 1d49b271..a7926dad 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
@@ -38,6 +38,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, &run);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 
 	mosquitto_connect_v5_callback_set(mosq, on_connect);
diff --git a/test/lib/c/03-publish-c2b-qos2.c b/test/lib/c/03-publish-c2b-qos2.c
index d17c8d6d..3d2eefa2 100644
--- a/test/lib/c/03-publish-c2b-qos2.c
+++ b/test/lib/c/03-publish-c2b-qos2.c
@@ -35,6 +35,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos2-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
 	mosquitto_publish_callback_set(mosq, on_publish);
diff --git a/test/lib/c/03-publish-qos0-no-payload.c b/test/lib/c/03-publish-qos0-no-payload.c
index 8fbc7854..4ed50f10 100644
--- a/test/lib/c/03-publish-qos0-no-payload.c
+++ b/test/lib/c/03-publish-qos0-no-payload.c
@@ -36,6 +36,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos0-test-np", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_publish_callback_set(mosq, on_publish);
 
diff --git a/test/lib/c/03-publish-qos0.c b/test/lib/c/03-publish-qos0.c
index 1562b3c3..2374c26a 100644
--- a/test/lib/c/03-publish-qos0.c
+++ b/test/lib/c/03-publish-qos0.c
@@ -36,6 +36,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos0-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_publish_callback_set(mosq, on_publish);
 
diff --git a/test/lib/c/03-request-response-1.c b/test/lib/c/03-request-response-1.c
index b1896db5..573b8665 100644
--- a/test/lib/c/03-request-response-1.c
+++ b/test/lib/c/03-request-response-1.c
@@ -45,6 +45,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("request-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_opts_set(mosq, MOSQ_OPT_PROTOCOL_VERSION, &ver);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
diff --git a/test/lib/c/03-request-response-2.c b/test/lib/c/03-request-response-2.c
index a7c11b9f..26fc6e98 100644
--- a/test/lib/c/03-request-response-2.c
+++ b/test/lib/c/03-request-response-2.c
@@ -50,6 +50,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("response-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_opts_set(mosq, MOSQ_OPT_PROTOCOL_VERSION, &ver);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_publish_callback_set(mosq, on_publish);
diff --git a/test/lib/c/03-request-response-correlation-1.c b/test/lib/c/03-request-response-correlation-1.c
index 9629c7a7..bbf9e35c 100644
--- a/test/lib/c/03-request-response-correlation-1.c
+++ b/test/lib/c/03-request-response-correlation-1.c
@@ -46,6 +46,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("request-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_opts_set(mosq, MOSQ_OPT_PROTOCOL_VERSION, &ver);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_subscribe_callback_set(mosq, on_subscribe);
diff --git a/test/lib/c/04-retain-qos0.c b/test/lib/c/04-retain-qos0.c
index 8b2fced3..c0db0c4d 100644
--- a/test/lib/c/04-retain-qos0.c
+++ b/test/lib/c/04-retain-qos0.c
@@ -25,6 +25,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("retain-qos0-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 
 	rc = mosquitto_connect(mosq, "localhost", port, 60);
diff --git a/test/lib/c/08-ssl-bad-cacert.c b/test/lib/c/08-ssl-bad-cacert.c
index b7291221..da91202a 100644
--- a/test/lib/c/08-ssl-bad-cacert.c
+++ b/test/lib/c/08-ssl-bad-cacert.c
@@ -12,6 +12,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-bad-cacert", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	if(mosquitto_tls_set(mosq, "this/file/doesnt/exist", NULL, NULL, NULL, NULL) == MOSQ_ERR_INVAL){
 		rc = 0;
 	}
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 b88f6f30..6d72bb06 100644
--- a/test/lib/c/08-ssl-connect-cert-auth-enc.c
+++ b/test/lib/c/08-ssl-connect-cert-auth-enc.c
@@ -39,6 +39,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-connect-crt-auth-enc", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_tls_set(mosq, "../ssl/test-root-ca.crt", "../ssl/certs", "../ssl/client-encrypted.crt", "../ssl/client-encrypted.key", password_callback);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
diff --git a/test/lib/c/08-ssl-connect-cert-auth.c b/test/lib/c/08-ssl-connect-cert-auth.c
index e101e0d1..6d5134be 100644
--- a/test/lib/c/08-ssl-connect-cert-auth.c
+++ b/test/lib/c/08-ssl-connect-cert-auth.c
@@ -30,6 +30,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-connect-crt-auth", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_tls_set(mosq, "../ssl/test-root-ca.crt", "../ssl/certs", "../ssl/client.crt", "../ssl/client.key", NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
diff --git a/test/lib/c/08-ssl-connect-no-auth.c b/test/lib/c/08-ssl-connect-no-auth.c
index 4b5024b6..86ac3d30 100644
--- a/test/lib/c/08-ssl-connect-no-auth.c
+++ b/test/lib/c/08-ssl-connect-no-auth.c
@@ -30,6 +30,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-connect-no-auth", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_tls_set(mosq, "../ssl/all-ca.crt", NULL, NULL, NULL, NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_disconnect_callback_set(mosq, on_disconnect);
diff --git a/test/lib/c/08-ssl-fake-cacert.c b/test/lib/c/08-ssl-fake-cacert.c
index 1dc05d8c..397034af 100644
--- a/test/lib/c/08-ssl-fake-cacert.c
+++ b/test/lib/c/08-ssl-fake-cacert.c
@@ -21,6 +21,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("08-ssl-connect-crt-auth", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_tls_set(mosq, "../ssl/test-fake-root-ca.crt", NULL, "../ssl/client.crt", "../ssl/client.key", NULL);
 	mosquitto_connect_callback_set(mosq, on_connect);
 
diff --git a/test/lib/c/11-prop-oversize-packet.c b/test/lib/c/11-prop-oversize-packet.c
index eff0082e..ac4c00b8 100644
--- a/test/lib/c/11-prop-oversize-packet.c
+++ b/test/lib/c/11-prop-oversize-packet.c
@@ -57,6 +57,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("publish-qos0-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_publish_callback_set(mosq, on_publish);
diff --git a/test/lib/c/11-prop-recv-qos0.c b/test/lib/c/11-prop-recv-qos0.c
index b430998f..c1432545 100644
--- a/test/lib/c/11-prop-recv-qos0.c
+++ b/test/lib/c/11-prop-recv-qos0.c
@@ -66,6 +66,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("prop-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_message_v5_callback_set(mosq, on_message_v5);
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
diff --git a/test/lib/c/11-prop-recv-qos1.c b/test/lib/c/11-prop-recv-qos1.c
index 2fe38681..661a33ba 100644
--- a/test/lib/c/11-prop-recv-qos1.c
+++ b/test/lib/c/11-prop-recv-qos1.c
@@ -66,6 +66,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("prop-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_message_v5_callback_set(mosq, on_message_v5);
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
diff --git a/test/lib/c/11-prop-recv-qos2.c b/test/lib/c/11-prop-recv-qos2.c
index 23527096..167d46b6 100644
--- a/test/lib/c/11-prop-recv-qos2.c
+++ b/test/lib/c/11-prop-recv-qos2.c
@@ -66,6 +66,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("prop-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_message_v5_callback_set(mosq, on_message_v5);
 	mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5);
diff --git a/test/lib/c/11-prop-send-content-type.c b/test/lib/c/11-prop-send-content-type.c
index 3222d9d5..71073d7e 100644
--- a/test/lib/c/11-prop-send-content-type.c
+++ b/test/lib/c/11-prop-send-content-type.c
@@ -43,6 +43,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("prop-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_publish_callback_set(mosq, on_publish);
 	tmp = MQTT_PROTOCOL_V5;
diff --git a/test/lib/c/11-prop-send-payload-format.c b/test/lib/c/11-prop-send-payload-format.c
index 2d2cd82e..4d03b9d2 100644
--- a/test/lib/c/11-prop-send-payload-format.c
+++ b/test/lib/c/11-prop-send-payload-format.c
@@ -43,6 +43,9 @@ int main(int argc, char *argv[])
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("prop-test", true, NULL);
+	if(mosq == NULL){
+		return 1;
+	}
 	mosquitto_connect_callback_set(mosq, on_connect);
 	mosquitto_publish_callback_set(mosq, on_publish);
 	tmp = MQTT_PROTOCOL_V5;