From: Mike Yuan Date: Sun, 5 Oct 2025 01:15:36 +0000 (+0200) Subject: shared/bus-get-properties: use sizeof instead of hardcoded size in bus_property_get_i... X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F39407%2Fhead;p=thirdparty%2Fsystemd.git shared/bus-get-properties: use sizeof instead of hardcoded size in bus_property_get_id128() Prompted by https://github.com/systemd/systemd/pull/39210#discussion_r2404225907 --- diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c index 6d6d52bd4c4..ffbe2b7930b 100644 --- a/src/shared/bus-get-properties.c +++ b/src/shared/bus-get-properties.c @@ -70,12 +70,12 @@ int bus_property_get_id128( void *userdata, sd_bus_error *reterr_error) { - sd_id128_t *id = userdata; + sd_id128_t *id = ASSERT_PTR(userdata); if (sd_id128_is_null(*id)) /* Add an empty array if the ID is zero */ return sd_bus_message_append(reply, "ay", 0); - else - return sd_bus_message_append_array(reply, 'y', id->bytes, 16); + + return sd_bus_message_append_array(reply, 'y', id->bytes, sizeof(sd_id128_t)); } #if __SIZEOF_SIZE_T__ != 8