diff options
| author | Teemu Ikonen <tpikonen@mailbox.org> | 2021-11-12 12:12:13 +0200 |
|---|---|---|
| committer | Teemu Ikonen <tpikonen@mailbox.org> | 2021-11-12 12:34:13 +0200 |
| commit | 5a3f7ffc36ea158f8ebb90e81c0604030c8b390a (patch) | |
| tree | 24b06c17fd6e5126728d29c2eac7170da4ba7156 | |
| parent | 3b5d236682772f926fa209ad9a0adef4c42d83cd (diff) | |
wifi: Remove scan wait timer on finalize
The timeout function 'on_scan_wait_done' was called with an invalid
GClueWifi arg, if the GClueWifi instance was finalized during the
timeout wait, a use after free error.
Save the timeout id to private data and remove the timeout in the
finalizer function.
| -rw-r--r-- | src/gclue-wifi.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gclue-wifi.c b/src/gclue-wifi.c index 6d8b7ff..ea35df8 100644 --- a/src/gclue-wifi.c +++ b/src/gclue-wifi.c @@ -83,6 +83,7 @@ struct _GClueWifiPrivate { gulong bss_added_id; gulong bss_removed_id; gulong scan_done_id; + guint scan_wait_id; guint scan_timeout; @@ -145,6 +146,8 @@ gclue_wifi_finalize (GObject *gwifi) disconnect_bss_signals (wifi); disconnect_cache_prune_timeout (wifi); + if (wifi->priv->scan_wait_id != 0) + g_source_remove (wifi->priv->scan_wait_id); g_clear_object (&wifi->priv->supplicant); g_clear_object (&wifi->priv->interface); @@ -504,6 +507,7 @@ on_scan_wait_done (gpointer wifi) g_debug ("Refreshing location…"); gclue_web_source_refresh (GCLUE_WEB_SOURCE (wifi)); } + priv->scan_wait_id = 0; return G_SOURCE_REMOVE; } @@ -527,7 +531,10 @@ on_scan_done (WPAInterface *object, if (priv->interface == NULL) return; - g_timeout_add_seconds (1, on_scan_wait_done, wifi); + if (priv->scan_wait_id != 0) + g_source_remove (priv->scan_wait_id); + + priv->scan_wait_id = g_timeout_add_seconds (1, on_scan_wait_done, wifi); /* If there was another scan already scheduled, cancel that and * re-schedule. Regardless of our internal book-keeping, this can happen |