chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: also check for NULL when appending trivial types
[elogind.git]
/
src
/
libsystemd-bus
/
bus-message.c
diff --git
a/src/libsystemd-bus/bus-message.c
b/src/libsystemd-bus/bus-message.c
index aaa19df39a16e1ddc1a7cef11dcc6183d28f19ce..3f9baca806d49f88d2df37f9f7f4ddacd07ecb40 100644
(file)
--- a/
src/libsystemd-bus/bus-message.c
+++ b/
src/libsystemd-bus/bus-message.c
@@
-1323,7
+1323,6
@@
int message_append_basic(sd_bus_message *m, char type, const void *p, const void
int r;
assert_return(m, -EINVAL);
int r;
assert_return(m, -EINVAL);
- assert_return(p, -EINVAL);
assert_return(!m->sealed, -EPERM);
assert_return(bus_type_is_basic(type), -EINVAL);
assert_return(!m->poisoned, -ESTALE);
assert_return(!m->sealed, -EPERM);
assert_return(bus_type_is_basic(type), -EINVAL);
assert_return(!m->poisoned, -ESTALE);
@@
-1380,6
+1379,12
@@
int message_append_basic(sd_bus_message *m, char type, const void *p, const void
break;
case SD_BUS_TYPE_BOOLEAN:
break;
case SD_BUS_TYPE_BOOLEAN:
+
+ if (!p) {
+ r = -EINVAL;
+ goto fail;
+ }
+
align = sz = 4;
assert_cc(sizeof(int) == sizeof(uint32_t));
align = sz = 4;
assert_cc(sizeof(int) == sizeof(uint32_t));
@@
-1391,6
+1396,11
@@
int message_append_basic(sd_bus_message *m, char type, const void *p, const void
case SD_BUS_TYPE_UNIX_FD: {
int z, *f;
case SD_BUS_TYPE_UNIX_FD: {
int z, *f;
+ if (!p) {
+ r = -EINVAL;
+ goto fail;
+ }
+
if (!m->allow_fds) {
r = -ENOTSUP;
goto fail;
if (!m->allow_fds) {
r = -ENOTSUP;
goto fail;
@@
-1425,6
+1435,11
@@
int message_append_basic(sd_bus_message *m, char type, const void *p, const void
}
default:
}
default:
+ if (!p) {
+ r = -EINVAL;
+ goto fail;
+ }
+
align = bus_type_get_alignment(type);
sz = bus_type_get_size(type);
break;
align = bus_type_get_alignment(type);
sz = bus_type_get_size(type);
break;
@@
-2669,7
+2684,7
@@
_public_ int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p) {
case SD_BUS_TYPE_BOOLEAN:
if (p)
case SD_BUS_TYPE_BOOLEAN:
if (p)
- *(
unsigned
*) p = !!*(uint32_t*) q;
+ *(
int
*) p = !!*(uint32_t*) q;
break;
case SD_BUS_TYPE_INT16:
break;
case SD_BUS_TYPE_INT16:
@@
-4424,7
+4439,7
@@
int bus_message_read_strv_extend(sd_bus_message *m, char ***l) {
return 0;
}
return 0;
}
-int sd_bus_message_read_strv(sd_bus_message *m, char ***l) {
+
_public_
int sd_bus_message_read_strv(sd_bus_message *m, char ***l) {
char **strv = NULL;
int r;
char **strv = NULL;
int r;