all: avoid g_memdup()

By using nm_memdup().

Except in shared/nm-utils/nm-compat.c, which may not include
"shared/nm-utils/nm-shared-utils.h".

5 files changed, 11 insertions, 10 deletions

diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
index 90328c065f..aa7c42f14e 100644
--- a/shared/nm-utils/nm-compat.c
+++ b/shared/nm-utils/nm-compat.c
@@ -60,7 +60,8 @@ _get_keys (NMSettingVpn *setting,
 	if (len) {
 		g_ptr_array_sort (a, nm_strcmp_p);
 		g_ptr_array_add (a, NULL);
-		keys = g_memdup (a->pdata, a->len * sizeof (gpointer));
+		keys = g_malloc (a->len * sizeof (gpointer));
+		memcpy (keys, a->pdata, a->len * sizeof (gpointer));
 
 		/* we need to cache the keys *somewhere*. */
 		g_object_set_qdata_full (G_OBJECT (setting),
diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c
index 7dbe835b8e..b67c537c8b 100644
--- a/src/nm-session-monitor.c
+++ b/src/nm-session-monitor.c
@@ -188,7 +188,7 @@ ck_load_cache (GHashTable *cache)
 		if (error)
 			goto out;
 
-		g_hash_table_insert (cache, GUINT_TO_POINTER (uid), g_memdup (&session, sizeof session));
+		g_hash_table_insert (cache, GUINT_TO_POINTER (uid), nm_memdup (&session, sizeof session));
 	}
 
 	finished = TRUE;
diff --git a/src/nm-test-utils-core.h b/src/nm-test-utils-core.h
index c76f510f2f..5e89cb39f1 100644
--- a/src/nm-test-utils-core.h
+++ b/src/nm-test-utils-core.h
@@ -216,8 +216,8 @@ nmtst_platform_ip4_routes_equal (const NMPlatformIP4Route *a, const NMPlatformIP
 	g_assert (b);
 
 	if (ignore_order) {
-		a = c_a = g_memdup (a, sizeof (NMPlatformIP4Route) * len);
-		b = c_b = g_memdup (b, sizeof (NMPlatformIP4Route) * len);
+		a = c_a = nm_memdup (a, sizeof (NMPlatformIP4Route) * len);
+		b = c_b = nm_memdup (b, sizeof (NMPlatformIP4Route) * len);
 		g_qsort_with_data (c_a, len, sizeof (NMPlatformIP4Route), _nmtst_platform_ip4_routes_equal_sort, NULL);
 		g_qsort_with_data (c_b, len, sizeof (NMPlatformIP4Route), _nmtst_platform_ip4_routes_equal_sort, NULL);
 	}
@@ -269,8 +269,8 @@ nmtst_platform_ip6_routes_equal (const NMPlatformIP6Route *a, const NMPlatformIP
 	g_assert (b);
 
 	if (ignore_order) {
-		a = c_a = g_memdup (a, sizeof (NMPlatformIP6Route) * len);
-		b = c_b = g_memdup (b, sizeof (NMPlatformIP6Route) * len);
+		a = c_a = nm_memdup (a, sizeof (NMPlatformIP6Route) * len);
+		b = c_b = nm_memdup (b, sizeof (NMPlatformIP6Route) * len);
 		g_qsort_with_data (c_a, len, sizeof (NMPlatformIP6Route), _nmtst_platform_ip6_routes_equal_sort, NULL);
 		g_qsort_with_data (c_b, len, sizeof (NMPlatformIP6Route), _nmtst_platform_ip6_routes_equal_sort, NULL);
 	}
diff --git a/src/platform/nm-netlink.c b/src/platform/nm-netlink.c
index 2064a4bba2..5ca7bb406c 100644
--- a/src/platform/nm-netlink.c
+++ b/src/platform/nm-netlink.c
@@ -1470,7 +1470,7 @@ retry:
 				continue;
 			if (cmsg->cmsg_type != SCM_CREDENTIALS)
 				continue;
-			tmpcreds = g_memdup (CMSG_DATA(cmsg), sizeof (*tmpcreds));
+			tmpcreds = nm_memdup (CMSG_DATA(cmsg), sizeof (*tmpcreds));
 			break;
 		}
 	}
diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c
index 431fc2b124..a8e6beb399 100644
--- a/src/platform/nmp-object.c
+++ b/src/platform/nmp-object.c
@@ -340,7 +340,7 @@ _vlan_xgress_qos_mappings_cpy (guint *dst_n_map,
 		g_clear_pointer (dst_map, g_free);
 		*dst_n_map = src_n_map;
 		if (src_n_map > 0)
-			*dst_map = g_memdup (src_map, sizeof (*src_map) * src_n_map);
+			*dst_map = nm_memdup (src_map, sizeof (*src_map) * src_n_map);
 	}
 }
 
@@ -452,9 +452,9 @@ _wireguard_peers_cpy (gsize *dst_n_peers,
 		g_clear_pointer (dst_peers, g_free);
 		*dst_n_peers = src_n_peers;
 		if (src_n_peers > 0)
-			*dst_peers = g_memdup (src_peers, sizeof (*src_peers) * src_n_peers);
+			*dst_peers = nm_memdup (src_peers, sizeof (*src_peers) * src_n_peers);
 		for (i = 0; i < src_n_peers; i++) {
-			dst_peers[i]->allowedips = g_memdup (src_peers[i].allowedips, sizeof (src_peers[i].allowedips) * src_peers[i].allowedips_len);
+			dst_peers[i]->allowedips = nm_memdup (src_peers[i].allowedips, sizeof (src_peers[i].allowedips) * src_peers[i].allowedips_len);
 			dst_peers[i]->allowedips_len = src_peers[i].allowedips_len;
 		}
 	}