summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-01-17 18:15:37 +0100
committerLukas Nykryn <lnykryn@redhat.com>2020-02-06 10:41:56 +0100
commit19a9c67b79ebb9a65bc2aec8d8f2799262ef0cb2 (patch)
tree30b50fb10a2ea7c319afc8553ece593219b4d2d9
parent9c23ceef0a08ffdf4aed7a96ec440e1b110568ac (diff)
downloadsystemd-19a9c67b79ebb9a65bc2aec8d8f2799262ef0cb2.tar.gz
sd-bus: make sure dispatch_rqueue() initializes return parameter on all types of success
Let's make sure our own code follows coding style and initializes all return values on all types of success (and leaves it uninitialized in all types of failure). (cherry picked from commit c0bc4ec5cc17ac61773d1e9362b0ffa8382c1ff1) Related: CVE-2020-1712
-rw-r--r--src/libsystemd/sd-bus/sd-bus.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 64026f7ee1..55b008cc9f 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1814,8 +1814,10 @@ static int dispatch_rqueue(sd_bus *bus, bool hint_priority, int64_t priority, sd
r = bus_read_message(bus, hint_priority, priority);
if (r < 0)
return r;
- if (r == 0)
+ if (r == 0) {
+ *m = NULL;
return ret;
+ }
ret = 1;
}