From 4ec8fffed978b83a163958ace5bb964ea79d6fa6 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 4 Nov 2026 22:26:59 +0900 Subject: [PATCH] fuzz-bus-message: use ASSERT_OK() and friends Replace assert_se() with the typed ASSERT_* macros, so that a failing assertion logs the values involved. --- src/libsystemd/sd-bus/fuzz-bus-message.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-bus/fuzz-bus-message.c b/src/libsystemd/sd-bus/fuzz-bus-message.c index c29c3843fed..2420e9d898d 100644 --- a/src/libsystemd/sd-bus/fuzz-bus-message.c +++ b/src/libsystemd/sd-bus/fuzz-bus-message.c @@ -7,6 +7,7 @@ #include "env-util.h" #include "fuzz.h" #include "memstream-util.h" +#include "tests.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { _cleanup_(memstream_done) MemStream ms = {}; @@ -19,18 +20,18 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { fuzz_setup_logging(); r = sd_bus_new(&bus); - assert_se(r >= 0); + ASSERT_OK(r); - assert_se(buffer = memdup(data, size)); + buffer = ASSERT_NOT_NULL(memdup(data, size)); r = bus_message_from_malloc(bus, buffer, size, /* fds= */ NULL, /* n_fds= */ 0, /* got_ctrunc= */ false, /* label= */ NULL, &m); if (r == -EBADMSG) return 0; - assert_se(r >= 0); + ASSERT_OK(r); TAKE_PTR(buffer); if (getenv_bool("SYSTEMD_FUZZ_OUTPUT") <= 0) - assert_se(g = memstream_init(&ms)); + g = ASSERT_NOT_NULL(memstream_init(&ms)); (void) sd_bus_message_dump(m, g, SD_BUS_MESSAGE_DUMP_WITH_HEADER); @@ -39,7 +40,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { (void) sd_json_variant_dump(v, SD_JSON_FORMAT_PRETTY | SD_JSON_FORMAT_COLOR_AUTO, g, /* prefix= */ NULL); r = sd_bus_message_rewind(m, /* complete= */ true); - assert_se(r >= 0); + ASSERT_OK(r); return 0; }