systemd/0310-sd-bus-drop-two-inappropriate-empty-lines.patch

32 lines
1.1 KiB
Diff

From 7e9944795e3f0046857379a5f878b365597ed373 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 17 Jan 2019 18:18:18 +0100
Subject: [PATCH] sd-bus: drop two inappropriate empty lines
(cherry picked from commit 39feb2ce417e54cf9746e64b5dfd610cef6ac440)
Related: CVE-2020-1712
---
src/libsystemd/sd-bus/sd-bus.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 55b008cc9f..01060d105c 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -2634,7 +2634,6 @@ static int process_builtin(sd_bus *bus, sd_bus_message *m) {
SD_BUS_ERROR_UNKNOWN_METHOD,
"Unknown method '%s' on interface '%s'.", m->member, m->interface);
}
-
if (r < 0)
return r;
@@ -2758,7 +2757,6 @@ static int process_running(sd_bus *bus, bool hint_priority, int64_t priority, sd
return r;
*ret = TAKE_PTR(m);
-
return 1;
}