From d84ae1902c25c1935e7b9573587993e0c9fb0a9f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mar 16 2021 04:19:35 +0000 Subject: sd-bus: drop two inappropriate empty lines (cherry picked from commit 39feb2ce417e54cf9746e64b5dfd610cef6ac440) Related: CVE-2020-1712 patch_name: 0310-sd-bus-drop-two-inappropriate-empty-lines.patch present_in_specfile: true location_in_specfile: 310 squash_commits: true --- diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 55b008c..01060d1 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; }