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-03 12:41:24 +0100
commit15d67e41826165a4468c51cb8a49dbe1b01843f0 (patch)
tree589239549ef1fccb8f57736a5aa9f05ba45fba58
parent64733f41a200a054e4bd5fc1d10f2d4e51c49dec (diff)
downloadsystemd-15d67e41826165a4468c51cb8a49dbe1b01843f0.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 f6719bdd80..9e7478e20d 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1770,8 +1770,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;
}