diff --git a/meson.build b/meson.build index e600a49a..bf9b241c 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ datadir = get_option('datadir') datadir_for_pc_file = join_paths('${prefix}', datadir) podir = join_paths(meson.source_root(), 'po') -glib_req_version = '>= 2.56' +glib_req_version = '>= 2.67.4' gtk_req_version = '>= 3.22' polkit_req_version = '>= 0.105' dazzle_req_version = '>= 3.30.0' diff --git a/src/libsysprof-ui/rectangles.c b/src/libsysprof-ui/rectangles.c index 2ac8ca05..9db41038 100644 --- a/src/libsysprof-ui/rectangles.c +++ b/src/libsysprof-ui/rectangles.c @@ -139,7 +139,7 @@ rectangles_sort (Rectangles *self) sysprof_color_cycle_next (self->cycle, &rgba); g_hash_table_insert (self->y_indexes, (gchar *)rect->name, GUINT_TO_POINTER (++sequence)); - g_hash_table_insert (self->colors, (gchar *)rect->name, g_memdup (&rgba, sizeof rgba)); + g_hash_table_insert (self->colors, (gchar *)rect->name, g_memdup2 (&rgba, sizeof rgba)); } } diff --git a/src/libsysprof-ui/sysprof-display.c b/src/libsysprof-ui/sysprof-display.c index 6be5faf1..43b8a7d0 100644 --- a/src/libsysprof-ui/sysprof-display.c +++ b/src/libsysprof-ui/sysprof-display.c @@ -673,7 +673,7 @@ sysprof_display_present_async (SysprofDisplay *self, return; } - g_task_set_task_data (task, g_memdup (&aids->len, sizeof aids->len), g_free); + g_task_set_task_data (task, g_memdup2 (&aids->len, sizeof aids->len), g_free); for (guint i = 0; i < aids->len; i++) { diff --git a/src/libsysprof-ui/sysprof-mark-visualizer.c b/src/libsysprof-ui/sysprof-mark-visualizer.c index 216cf62a..88cd6c83 100644 --- a/src/libsysprof-ui/sysprof-mark-visualizer.c +++ b/src/libsysprof-ui/sysprof-mark-visualizer.c @@ -252,7 +252,7 @@ sysprof_mark_visualizer_set_group_rgba (SysprofMarkVisualizer *self, g_hash_table_insert (self->rgba_by_group, g_strdup (group), - g_memdup (rgba, sizeof *rgba)); + g_memdup2 (rgba, sizeof *rgba)); } void diff --git a/src/libsysprof-ui/sysprof-marks-aid.c b/src/libsysprof-ui/sysprof-marks-aid.c index 66b2c258..98744c91 100644 --- a/src/libsysprof-ui/sysprof-marks-aid.c +++ b/src/libsysprof-ui/sysprof-marks-aid.c @@ -278,7 +278,7 @@ sysprof_marks_aid_present_finish (SysprofAid *aid, dzl_rgba_shade (&rgba, &kind_rgba, 1 + (ratio * span->kind)); g_hash_table_insert (seen, GUINT_TO_POINTER (span->kind), - g_memdup (&kind_rgba, sizeof kind_rgba)); + g_memdup2 (&kind_rgba, sizeof kind_rgba)); } } diff --git a/src/libsysprof/binfile.c b/src/libsysprof/binfile.c index 2f108739..145322ef 100644 --- a/src/libsysprof/binfile.c +++ b/src/libsysprof/binfile.c @@ -328,7 +328,7 @@ get_vdso_bytes (size_t *length) * wrapper never returned that address. But since it * is a legal mapping, it is legal to read it. */ - bytes = g_memdup ((uint8_t *)start, n_bytes); + bytes = g_memdup2 ((uint8_t *)start, n_bytes); has_data = TRUE; } diff --git a/src/libsysprof/sysprof-helpers.c b/src/libsysprof/sysprof-helpers.c index 75463761..80a630d2 100644 --- a/src/libsysprof/sysprof-helpers.c +++ b/src/libsysprof/sysprof-helpers.c @@ -183,7 +183,7 @@ sysprof_helpers_list_processes (SysprofHelpers *self, gsize len; data = g_variant_get_fixed_array (fixed_ar, &len, sizeof (gint32)); - *processes = g_memdup (data, len * sizeof (gint32)); + *processes = g_memdup2 (data, len * sizeof (gint32)); *n_processes = len; return TRUE; @@ -239,7 +239,7 @@ sysprof_helpers_list_processes_finish (SysprofHelpers *self, p = g_variant_get_fixed_array (ret, &n, sizeof (gint32)); if (processes != NULL) - *processes = g_memdup (p, n * sizeof (gint32)); + *processes = g_memdup2 (p, n * sizeof (gint32)); if (n_processes != NULL) *n_processes = n;