lvm-dbus: Fix leaking error in bd_lvm_init

(cherry picked from commit 04f166a1b5615a813ebc910a1205247208071f3e)
This commit is contained in:
liuh 2024-06-23 13:06:06 +08:00 committed by openeuler-sync-bot
parent 7206205e0a
commit 972eee7dda
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From e6810f64f49d789099b96d69ae25705c6bdbe7c9 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 26 Mar 2024 14:04:27 +0100
Subject: [PATCH] lvm-dbus: Fix leaking error in bd_lvm_init
---
src/plugins/lvm-dbus.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/plugins/lvm-dbus.c b/src/plugins/lvm-dbus.c
index e822bd6..a9c1d11 100644
--- a/src/plugins/lvm-dbus.c
+++ b/src/plugins/lvm-dbus.c
@@ -337,6 +337,7 @@ gboolean bd_lvm_init (void) {
completely rely on it */
if (G_UNLIKELY (!bus) && !setup_dbus_connection (&error)) {
bd_utils_log_format (BD_UTILS_LOG_CRIT, "Failed to setup DBus connection: %s", error->message);
+ g_clear_error (&error);
return FALSE;
}
--
2.43.0

View File

@ -3,7 +3,7 @@
Name: libblockdev
Version: 3.0.4
Release: 5
Release: 6
Summary: libblockdev is a C library supporting GObject introspection for manipulation of block devices
License: LGPLv2+
URL: https://github.com/storaged-project/libblockdev
@ -11,6 +11,7 @@ Source0: https://github.com/storaged-project/libblockdev/releases/download/%{ver
Patch1: 0001-Add-BDPluginSpec-constructor-and-use-it-in-plugin_sp.patch
Patch2: 0002-Fix-leaking-error.patch
Patch3: 0003-lvm-dbus-Fix-leaking-error-in-bd_lvm_init.patch
BuildRequires: make glib2-devel libyaml-devel libbytesize-devel parted-devel libuuid-devel ndctl-devel device-mapper-devel
BuildRequires: device-mapper-devel systemd-devel nss-devel volume_key-devel >= 0.3.9-7 libblkid-devel libmount-devel
@ -160,6 +161,12 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
%changelog
* Tue Jun 25 2024 liuh <liuhuan01@kylinos.cn> - 3.0.4-6
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:lvm-dbus: Fix leaking error in bd_lvm_init
* Sat May 11 2024 yanshuai <yanshuai@kylinos.cn> - 3.0.4-5
- Type:bugfix
- ID:NA