fuzz-and-sonarqube-fixes

Author: lws-team

lib/roles/http/server/lejp-conf.c

@@ -449,11 +449,11 @@ lejp_globals_cb(struct lejp_ctx *ctx, char reason)
 	struct lws_protocol_vhost_options *rej;
 	char *p;
 
-	if (reason == LEJPCB_VAL_STR_START ||
-	    reason == LEJPCB_VAL_STR_CHUNK ||
-	    reason == LEJPCB_VAL_STR_END)
-		if (lejp_string_unify_part(ctx, &a->ac, reason))
-			return 1;
+	if ((reason == LEJPCB_VAL_STR_START ||
+	     reason == LEJPCB_VAL_STR_CHUNK ||
+	     reason == LEJPCB_VAL_STR_END) &&
+	    lejp_string_unify_part(ctx, &a->ac, reason))
+		return 1;
 
 	/* we only match on the prepared path strings */
 	if (!(reason & LEJP_FLAG_CB_IS_VALUE) || !ctx->path_match)
@@ -605,11 +605,11 @@ lejp_vhosts_cb(struct lejp_ctx *ctx, char reason)
 	char *p, *p1;
 	int n;
 
-	if (reason == LEJPCB_VAL_STR_START ||
-	    reason == LEJPCB_VAL_STR_CHUNK ||
-	    reason == LEJPCB_VAL_STR_END)
-		if (lejp_string_unify_part(ctx, &a->ac, reason))
-			return 1;
+	if ((reason == LEJPCB_VAL_STR_START ||
+	     reason == LEJPCB_VAL_STR_CHUNK ||
+	     reason == LEJPCB_VAL_STR_END) &&
+	    lejp_string_unify_part(ctx, &a->ac, reason))
+		return 1;
 
 #if 0
 	lwsl_notice(" %d: %s (%d)\n", reason, ctx->path, ctx->path_match);

lib/tls/gnutls/gnutls-tls.c

@@ -292,9 +292,12 @@ lws_tls_client_create_vhost_context(struct lws_vhost *vh,
 	} else if (cert_mem && cert_mem_len && key_mem && key_mem_len) {
 		gnutls_datum_t dcert, dkey;
 
-		dcert.data = (unsigned char *)cert_mem;
+		/* gnutls_datum_t data lacks const, so has to alias the
+		 * caller's const buffers via a cast that doesn't drop it
+		 */
+		dcert.data = (unsigned char *)(uintptr_t)cert_mem;
 		dcert.size = (unsigned)cert_mem_len;
-		dkey.data = (unsigned char *)key_mem;
+		dkey.data = (unsigned char *)(uintptr_t)key_mem;
 		dkey.size = (unsigned)key_mem_len;
 
 		if (gnutls_certificate_set_x509_key_mem(

minimal-examples-lowlevel/api-tests/api-test-lws_stub/main.c

@@ -19,6 +19,7 @@
 #if !defined(WIN32)
 #include <unistd.h>
 #include <sys/wait.h>
+#include <time.h>
 #else
 #include <process.h>
 #include <io.h>
@@ -73,7 +74,7 @@ stub_gone_marker_path(void)
 {
 	static char path[300];
 
-	lws_snprintf(path, sizeof(path), "/tmp/lws-%s.gone", STUB_NAME_P3);
+	lws_snprintf(path, sizeof(path), "/tmp/lws-%s.gone", STUB_NAME_P3); // NOSONAR
 
 	return path;
 }
@@ -253,7 +254,7 @@ static void stub_parent_gone_cb(void *user)
 		return;
 
 	/* leave a marker so the test can prove this ran in the stub child */
-	lws_snprintf(path, sizeof(path), "/tmp/lws-%s.gone", stub_name);
+	lws_snprintf(path, sizeof(path), "/tmp/lws-%s.gone", stub_name); // NOSONAR
 	fd = open(path, O_CREAT | O_WRONLY | O_TRUNC, 0600);
 	if (fd >= 0) {
 		if (write(fd, &ok, 1) < 0)
@@ -279,7 +280,7 @@ static int run_stub(struct lws_context *cx, const char *stub_name)
 	sc.stub_name = stub_name;
 	sc.uds_path = stub_uds_path(stub_name);
 	sc.protocols = stub_protocols;
-	sc.user = (void *)stub_name;
+	sc.user = (void *)(uintptr_t)stub_name;
 	sc.parent_gone_cb = stub_parent_gone_cb;
 
 	if (lws_stub_server_init(&sc, secret, extra, sizeof(extra)) < 0) {
@@ -594,10 +595,11 @@ phase3(int argc, const char **argv)
 	 */
 	start = lws_now_usecs();
 	while (lws_now_usecs() - start < 10000000) { /* 10s */
+		struct timespec ts = { .tv_nsec = 100 * 1000 * 1000 };
 		if (gone_marker_present() &&
 		    stat(stub_uds_path(STUB_NAME_P3), &st))
 			break;
-		usleep(100000);
+		nanosleep(&ts, NULL);
 	}
 
 	if (!gone_marker_present()) {