40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 4ddab4fb7e1ccc7dc466534250177b7d2682a9e2 Mon Sep 17 00:00:00 2001
|
|
From: Panu Matilainen <pmatilai@redhat.com>
|
|
Date: Wed, 29 Jan 2020 15:39:58 +0200
|
|
Subject: [PATCH] Fix a minor memory leak on suppressed inhibition lock warning
|
|
message
|
|
|
|
Commit 708e61307bc3fd027b016fdf5a1d1a5274c1843c introduced a memory leak
|
|
on the error object: if the message is suppressed then the error object
|
|
is never freed. Test for the suppression conditions separately to fix.
|
|
---
|
|
plugins/systemd_inhibit.c | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/plugins/systemd_inhibit.c b/plugins/systemd_inhibit.c
|
|
index 0ddca9cd8..ecff30533 100644
|
|
--- a/plugins/systemd_inhibit.c
|
|
+++ b/plugins/systemd_inhibit.c
|
|
@@ -52,12 +52,14 @@ static int inhibit(void)
|
|
dbus_message_unref(reply);
|
|
}
|
|
|
|
- if (dbus_error_is_set(&err)
|
|
- && !dbus_error_has_name(&err, DBUS_ERROR_NO_SERVER)
|
|
- && !dbus_error_has_name(&err, DBUS_ERROR_FILE_NOT_FOUND)) {
|
|
- rpmlog(RPMLOG_WARNING,
|
|
+ if (dbus_error_is_set(&err)) {
|
|
+ if (!dbus_error_has_name(&err, DBUS_ERROR_NO_SERVER) &&
|
|
+ !dbus_error_has_name(&err, DBUS_ERROR_FILE_NOT_FOUND))
|
|
+ {
|
|
+ rpmlog(RPMLOG_WARNING,
|
|
"Unable to get systemd shutdown inhibition lock: %s\n",
|
|
err.message);
|
|
+ }
|
|
dbus_error_free(&err);
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|