From d346179137d0f634baba2651a8091d08e9e915b2 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Fri, 16 Jan 2026 14:15:14 +0000 Subject: [PATCH] Formatting --- fuzzing/broker/broker_fuzz_proxy_v1.cpp | 8 ++++++-- fuzzing/broker/broker_fuzz_proxy_v2.cpp | 7 +++++-- fuzzing/libcommon/libcommon_fuzz_topic_matching.cpp | 2 +- lib/packet_mosq.c | 2 ++ src/mosquitto_broker_internal.h | 2 +- test/unit/libcommon/base64_test.c | 4 ++++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/fuzzing/broker/broker_fuzz_proxy_v1.cpp b/fuzzing/broker/broker_fuzz_proxy_v1.cpp index 5a0bd212f..7d5a4170c 100644 --- a/fuzzing/broker/broker_fuzz_proxy_v1.cpp +++ b/fuzzing/broker/broker_fuzz_proxy_v1.cpp @@ -30,6 +30,7 @@ static int packet_data_remaining = 0; extern "C" { #include "mosquitto_broker_internal.h" + ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count) { int res = count < packet_data_remaining?count:packet_data_remaining; @@ -38,6 +39,7 @@ ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count) return res; } + int net__socket_get_address(mosq_sock_t sock, char *buf, size_t len, uint16_t *remote_port) { snprintf(buf, len, "localhost"); @@ -45,6 +47,7 @@ int net__socket_get_address(mosq_sock_t sock, char *buf, size_t len, uint16_t *r return MOSQ_ERR_SUCCESS; } + int http__context_init(struct mosquitto *context) { context->transport = mosq_t_http; @@ -52,6 +55,7 @@ int http__context_init(struct mosquitto *context) return MOSQ_ERR_SUCCESS; } + int log__printf(struct mosquitto *mosq, unsigned int priority, const char *fmt, ...) { return MOSQ_ERR_SUCCESS; @@ -62,8 +66,8 @@ int log__printf(struct mosquitto *mosq, unsigned int priority, const char *fmt, extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - struct mosquitto context{}; - struct mosquitto__listener listener{}; + struct mosquitto context {}; + struct mosquitto__listener listener {}; packet_data = data; packet_data_pos = 0; diff --git a/fuzzing/broker/broker_fuzz_proxy_v2.cpp b/fuzzing/broker/broker_fuzz_proxy_v2.cpp index 73746178e..3f7412c43 100644 --- a/fuzzing/broker/broker_fuzz_proxy_v2.cpp +++ b/fuzzing/broker/broker_fuzz_proxy_v2.cpp @@ -30,6 +30,7 @@ static int packet_data_remaining = 0; extern "C" { #include "mosquitto_broker_internal.h" + ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count) { int res = count < packet_data_remaining?count:packet_data_remaining; @@ -38,6 +39,7 @@ ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count) return res; } + int http__context_init(struct mosquitto *context) { context->transport = mosq_t_http; @@ -45,6 +47,7 @@ int http__context_init(struct mosquitto *context) return MOSQ_ERR_SUCCESS; } + int log__printf(struct mosquitto *mosq, unsigned int priority, const char *fmt, ...) { return MOSQ_ERR_SUCCESS; @@ -55,8 +58,8 @@ int log__printf(struct mosquitto *mosq, unsigned int priority, const char *fmt, extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - struct mosquitto context{}; - struct mosquitto__listener listener{}; + struct mosquitto context {}; + struct mosquitto__listener listener {}; packet_data = data; packet_data_pos = 0; diff --git a/fuzzing/libcommon/libcommon_fuzz_topic_matching.cpp b/fuzzing/libcommon/libcommon_fuzz_topic_matching.cpp index 1aa21387e..2119d33e3 100644 --- a/fuzzing/libcommon/libcommon_fuzz_topic_matching.cpp +++ b/fuzzing/libcommon/libcommon_fuzz_topic_matching.cpp @@ -18,7 +18,7 @@ DEFINE_PROTO_FUZZER(const fuzz_topic_matches_sub::FuzzerInput& fuzzer_input) clientid = fuzzer_input.clientid().c_str(); } - //targeted_function_1(fuzzer_input.arg1(), fuzzer_input.arg2(), fuzzer_input.arg3()); + //targeted_function_1(fuzzer_input.arg1(), fuzzer_input.arg2(), fuzzer_input.arg3()); mosquitto_topic_matches_sub(string1, string2, &result); mosquitto_topic_matches_sub2(string1, strlen(string1), string2, strlen(string2), &result); mosquitto_topic_matches_sub_with_pattern(string1, string2, clientid, username, &result); diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c index 61ed69e1e..27616ac7e 100644 --- a/lib/packet_mosq.c +++ b/lib/packet_mosq.c @@ -395,6 +395,8 @@ static int read_header(struct mosquitto *mosq, ssize_t (*func_read)(struct mosqu #ifdef WITH_BROKER + + static int packet__check_in_packet_oversize(struct mosquitto *mosq) { switch(mosq->in_packet.command & 0xF0){ diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h index 212ff9d81..21926a292 100644 --- a/src/mosquitto_broker_internal.h +++ b/src/mosquitto_broker_internal.h @@ -956,7 +956,7 @@ void service_uninstall(char *name); void service_run(char *name); #ifdef WIN32 -DWORD WINAPI SigThreadProc(void* data); +DWORD WINAPI SigThreadProc(void *data); #endif #endif diff --git a/test/unit/libcommon/base64_test.c b/test/unit/libcommon/base64_test.c index 73b1b9e29..0dcf89bb2 100644 --- a/test/unit/libcommon/base64_test.c +++ b/test/unit/libcommon/base64_test.c @@ -4,9 +4,13 @@ #include "mosquitto/mqtt_protocol.h" #include "property_common.h" + //int mosquitto_base64_encode(const unsigned char *in, size_t in_len, char **encoded); + + //int mosquitto_base64_decode(const char *in, unsigned char **decoded, unsigned int *decoded_len); + static void check_encode(const char *input, size_t in_len, const char *expected_output) { char *encoded;