cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-08 20:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

pam: Fix eventfd leak

Browse Source 
When we create our own GMainContext, we need to be the ones
disposing of it as well, as GMainLoop won't take ownership of it.

From https://bugzilla.redhat.com/show_bug.cgi?id=1050827
This commit is contained in:
Bastien Nocera
2014-01-27 12:24:14 +01:00
parent fc228b9976
commit 7e4630ced2
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pam/pam_fprintd.c
View File

@ -170,6 +170,17 @@ static void close_and_unref (DBusGConnection *connection)
dbus_g_connection_unref (connection); dbus_g_connection_unref (connection);
} }
static void unref_loop (GMainLoop *loop)
{
GMainContext *ctx;
/* The main context was created separately, so
* we'll need to unref it ourselves */
ctx = g_main_loop_get_context (loop);
g_main_loop_unref (loop);
g_main_context_unref (ctx);
}
#define DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH)) #define DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
static DBusGProxy *open_device(pam_handle_t *pamh, DBusGConnection *connection, DBusGProxy *manager, const char *username, gboolean *has_multiple_devices) static DBusGProxy *open_device(pam_handle_t *pamh, DBusGConnection *connection, DBusGProxy *manager, const char *username, gboolean *has_multiple_devices)
@ -397,13 +408,13 @@ static int do_auth(pam_handle_t *pamh, const char *username)
dev = open_device(pamh, connection, manager, username, &has_multiple_devices); dev = open_device(pamh, connection, manager, username, &has_multiple_devices);
g_object_unref (manager); g_object_unref (manager);
if (!dev) { if (!dev) {
g_main_loop_unref (loop); unref_loop (loop);
close_and_unref (connection); close_and_unref (connection);
return PAM_AUTHINFO_UNAVAIL; return PAM_AUTHINFO_UNAVAIL;
} }
ret = do_verify(loop, pamh, dev, has_multiple_devices); ret = do_verify(loop, pamh, dev, has_multiple_devices);
g_main_loop_unref (loop); unref_loop (loop);
release_device(pamh, dev); release_device(pamh, dev);
g_object_unref (dev); g_object_unref (dev);
close_and_unref (connection); close_and_unref (connection);