mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-06-26 01:06:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

portal: Check if the monitor is closed before emitting progress

Browse Source 
`emit_progress` is called from a thread while another thread could
unexport/close the GDbusInterfaceSkeleton. If that happens, the
connection becomes NULL which is illegal for
`g_dbus_connection_emit_signal` which results in dereferencing an unset
error.

The fix is to lock the UpdateMonitorData, and then only emit the signal
if it is not closed.
This commit is contained in:
Sebastian Wick
2026-06-13 15:40:17 +02:00
parent c4fce9e42a
commit ce4a27e1fe
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
portal/flatpak-portal.c
View File

@@ -2357,7 +2357,6 @@ emit_progress (PortalFlatpakUpdateMonitor *monitor,
const char *error_message)
{
UpdateMonitorData *m = update_monitor_get_data (monitor);
GDBusConnection *connection;
GVariantBuilder builder;
g_autoptr(GError) error = NULL;
@@ -2379,8 +2378,10 @@ emit_progress (PortalFlatpakUpdateMonitor *monitor,
g_variant_builder_add (&builder, "{sv}", "error_message", g_variant_new_string (error_message));
}
connection = update_monitor_get_connection (monitor);
if (!g_dbus_connection_emit_signal (connection,
g_mutex_lock (&m->lock);
if (!m->closed &&
!g_dbus_connection_emit_signal (update_monitor_get_connection (monitor),
m->sender,
m->obj_path,
FLATPAK_PORTAL_INTERFACE_UPDATE_MONITOR,
@@ -2390,6 +2391,8 @@ emit_progress (PortalFlatpakUpdateMonitor *monitor,
{
g_warning ("Failed to emit ::progress: %s", error->message);
}
g_mutex_unlock (&m->lock);
}
static char *