chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: epoll and signalfd has been moved into sd event loop
[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 4488e7b6b37115cc4597aa97ad750542c435446e..0f19ee238ada80b3be29556d16ebeae902fdcd9d 100644
(file)
--- a/
src/libsystemd-bus/bus-message.c
+++ b/
src/libsystemd-bus/bus-message.c
@@
-791,7
+791,9
@@
_public_ sd_bus_message* sd_bus_message_ref(sd_bus_message *m) {
}
_public_ sd_bus_message* sd_bus_message_unref(sd_bus_message *m) {
}
_public_ sd_bus_message* sd_bus_message_unref(sd_bus_message *m) {
- assert_return(m, NULL);
+
+ if (!m)
+ return NULL;
assert(m->n_ref > 0);
m->n_ref--;
assert(m->n_ref > 0);
m->n_ref--;
@@
-3061,7
+3063,7
@@
static int message_peek_body(
}
part = find_part(m, start, nbytes, (void**) &q);
}
part = find_part(m, start, nbytes, (void**) &q);
- if (!part ||
!q
)
+ if (!part ||
(nbytes > 0 && !q)
)
return -EBADMSG;
*rindex = end;
return -EBADMSG;
*rindex = end;