You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
1.1 KiB
29 lines
1.1 KiB
2 years ago
|
From 7da1d4780b1dae16369fa5191832ec26d24a2ace Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daan De Meyer <daan.j.demeyer@gmail.com>
|
||
|
|
Date: Fri, 11 Nov 2022 11:09:28 +0100
|
||
|
|
Subject: [PATCH] sd-bus: Use goto finish instead of return in
|
||
|
|
bus_add_match_full
|
||
|
|
|
||
|
|
Fixes #25340
|
||
|
|
|
||
|
|
(cherry picked from commit 0f3c342903d1a09577378912717539b530af1fcf)
|
||
|
|
|
||
|
|
Related: #2138081
|
||
|
|
---
|
||
|
|
src/libsystemd/sd-bus/sd-bus.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
|
||
|
|
index 3803a2c4c4..bc716afabf 100644
|
||
|
|
--- a/src/libsystemd/sd-bus/sd-bus.c
|
||
|
|
+++ b/src/libsystemd/sd-bus/sd-bus.c
|
||
|
|
@@ -3529,7 +3529,7 @@ static int bus_add_match_full(
|
||
|
|
s);
|
||
|
|
|
||
|
|
if (r < 0)
|
||
|
|
- return r;
|
||
|
|
+ goto finish;
|
||
|
|
|
||
|
|
/* Make the slot of the match call floating now. We need the reference, but we don't
|
||
|
|
* want that this match pins the bus object, hence we first create it non-floating, but
|