shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

sd-bus: add define for the maximum signature length

Browse Source 
Less magic numbers in the code…
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-04-11 14:02:59 +02:00
parent f0ae945ecc
commit cfcc0059bf
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/sd-bus/bus-message.c
View File

@ -284,7 +284,7 @@ static int message_append_field_signature(
/* dbus1 doesn't allow signatures over 8bit, let's enforce
* this globally, to not risk convertability */
l = strlen(s);
if (l > 255)
if (l > SD_BUS_MAXIMUM_SIGNATURE_LENGTH)
return -EINVAL;
/* Signature "(yv)" where the variant contains "g" */

2
src/libsystemd/sd-bus/bus-signature.c
View File

@ -144,5 +144,5 @@ bool signature_is_valid(const char *s, bool allow_dict_entry) {
p += t;
}
return p - s <= 255;
return p - s <= SD_BUS_MAXIMUM_SIGNATURE_LENGTH;
}

3
src/systemd/sd-bus.h
View File

@ -33,6 +33,9 @@ _SD_BEGIN_DECLARATIONS;
#define SD_BUS_DEFAULT_USER ((sd_bus *) 2)
#define SD_BUS_DEFAULT_SYSTEM ((sd_bus *) 3)
/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-signature */
#define SD_BUS_MAXIMUM_SIGNATURE_LENGTH 255
/* Types */
typedef struct sd_bus sd_bus;