34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 85d37c860d29041df21038d14a4268419836bb51 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)
|
|
(cherry picked from commit eea92b179d07ef46b2fdfe4e0a918278ac43a81c)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd-stable/commit/85d37c860d29041df21038d14a4268419836bb51
|
|
---
|
|
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 a9189360fd..287d7d4753 100644
|
|
--- a/src/libsystemd/sd-bus/sd-bus.c
|
|
+++ b/src/libsystemd/sd-bus/sd-bus.c
|
|
@@ -3530,7 +3530,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
|
|
--
|
|
2.33.0
|
|
|