teknoraver / rpms / systemd

Forked from rpms/systemd 3 months ago
Clone

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

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