dryang / rpms / systemd

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