colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "libnm: fix dangling pointer in public API while destructing NMClient"

Browse Source 
This breaks test @nmcli_monitor. With this patch, `nmcli monitor` no
longer prints "There's no primary connection". Need to investigate why.
For now, revert the patch.

This reverts commit 2afecaf908.
This commit is contained in:
Thomas Haller
2022-01-25 21:38:27 +01:00
parent a2d2ea6ea6
commit 62b2aa85e8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libnm-client-impl/nm-client.c
View File

@@ -1799,7 +1799,6 @@ nml_dbus_property_o_notify(NMClient *self,
if (pr_o->obj_watcher if (pr_o->obj_watcher
&& (!dbus_path || !nm_streq(dbus_path, pr_o->obj_watcher->dbobj->dbus_path->str))) { && (!dbus_path || !nm_streq(dbus_path, pr_o->obj_watcher->dbobj->dbus_path->str))) {
pr_o->nmobj = NULL;
_dbobjs_obj_watcher_unregister(self, g_steal_pointer(&pr_o->obj_watcher)); _dbobjs_obj_watcher_unregister(self, g_steal_pointer(&pr_o->obj_watcher));
changed = TRUE; changed = TRUE;
} }

4
src/libnm-client-impl/tests/test-nm-client.c
View File

@@ -812,7 +812,7 @@ _dev_eth0_1_state_changed_cb(NMDevice *device,
g_assert(arr); g_assert(arr);
g_assert_cmpint(arr->len, ==, 0); g_assert_cmpint(arr->len, ==, 0);
g_assert(!nm_device_get_active_connection(device)); // g_assert(!nm_device_get_active_connection(device));
} }
static void static void
@@ -921,7 +921,7 @@ test_activate_virtual(void)
g_assert(arr); g_assert(arr);
g_assert_cmpint(arr->len, ==, 0); g_assert_cmpint(arr->len, ==, 0);
g_assert(!nm_device_get_active_connection(dev_eth0_1)); // g_assert(!nm_device_get_active_connection(dev_eth0_1));
nm_clear_g_signal_handler(dev_eth0_1, &sig_id); nm_clear_g_signal_handler(dev_eth0_1, &sig_id);