From 3d6bffe7fe0beb0827292d415c2ba8b8920989a4 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Thu, 30 Apr 2026 09:01:16 +0800 Subject: [PATCH] Settings: fixes DBusMessage reply leaks in XFConf functions Co-authored-by: Copilot --- src/common/impl/settings.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/common/impl/settings.c b/src/common/impl/settings.c index e62342ded..bd7da7424 100644 --- a/src/common/impl/settings.c +++ b/src/common/impl/settings.c @@ -225,6 +225,7 @@ FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, dbus.lib->ffdbus_message_unref(reply); return (FFvariant) { .intValue = value }; } + dbus.lib->ffdbus_message_unref(reply); return FF_VARIANT_NULL; } @@ -234,6 +235,7 @@ FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, dbus.lib->ffdbus_message_unref(reply); return (FFvariant) { .strValue = value.chars }; // Leaks value.chars } + dbus.lib->ffdbus_message_unref(reply); return FF_VARIANT_NULL; } @@ -245,6 +247,7 @@ FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, } } + dbus.lib->ffdbus_message_unref(reply); return FF_VARIANT_NULL; } @@ -297,6 +300,7 @@ FFvariant ffSettingsGetXFConfFirstMatch(const char* channelName, const char* pro dbus.lib->ffdbus_message_unref(reply); return (FFvariant) { .intValue = value }; } + dbus.lib->ffdbus_message_unref(reply); return FF_VARIANT_NULL; } @@ -306,6 +310,7 @@ FFvariant ffSettingsGetXFConfFirstMatch(const char* channelName, const char* pro dbus.lib->ffdbus_message_unref(reply); return (FFvariant) { .strValue = value.chars }; // Leaks value.chars } + dbus.lib->ffdbus_message_unref(reply); return FF_VARIANT_NULL; } @@ -317,9 +322,11 @@ FFvariant ffSettingsGetXFConfFirstMatch(const char* channelName, const char* pro } } + dbus.lib->ffdbus_message_unref(reply); return FF_VARIANT_NULL; } + dbus.lib->ffdbus_message_unref(reply); return FF_VARIANT_NULL; } #else // FF_HAVE_DBUS