picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus: handle serialization of NULL strings

Browse source 
Instead of simply crashing be somewhat nicer and serialize a NULL string
into the empty string and generate an error on signature and object path
strings.
This commit is contained in:
Lennart Poettering 2013-11-06 02:01:43 +01:00
parent 41f85451d3
commit cd6f997f71
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libsystemd-bus/bus-message.c
View file

@ -1347,14 +1347,29 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
switch (type) {
case SD_BUS_TYPE_STRING:
/* To make things easy we'll serialize a NULL string
* into the empty string */
p = strempty(p);
/* Fall through... */
case SD_BUS_TYPE_OBJECT_PATH:
if (!p) {
r = -EINVAL;
goto fail;
}
align = 4;
sz = 4 + strlen(p) + 1;
break;
case SD_BUS_TYPE_SIGNATURE:
if (!p) {
r = -EINVAL;
goto fail;
}
align = 1;
sz = 1 + strlen(p) + 1;
break;