AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

tests: Move from g_memdup() to g_memdup2()

Browse Source 
The g_memdup() function is replaced by a safer version in newer versions
of GLib.
This commit is contained in:
Emmanuele Bassi 2021-02-04 19:26:58 +00:00
parent a63a2b26cf
commit b74a9445af
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testsuite/gtk/timsort.c
View File

@ -21,6 +21,10 @@
#include "gtk/timsort/gtktimsortprivate.h" #include "gtk/timsort/gtktimsortprivate.h"
#if !GLIB_CHECK_VERSION (2, 67, 3)
# define g_memdup2(mem,size) g_memdup((mem), (size))
#endif
#define assert_sort_equal(a, b, size, n) \ #define assert_sort_equal(a, b, size, n) \
g_assert_cmpmem (a, sizeof (size) * n, b, sizeof (size) * n) g_assert_cmpmem (a, sizeof (size) * n, b, sizeof (size) * n)
@ -70,7 +74,9 @@ run_comparison (gpointer a,
gint64 start, mid, end; gint64 start, mid, end;
gpointer b; gpointer b;
b = g_memdup (a, element_size * n); g_assert (n <= G_MAXSIZE / element_size);
b = g_memdup2 (a, element_size * n);
start = g_get_monotonic_time (); start = g_get_monotonic_time ();
gtk_tim_sort (a, n, element_size, compare_func, data); gtk_tim_sort (a, n, element_size, compare_func, data);
@ -209,7 +215,7 @@ test_steps (void)
a = g_new (int, n); a = g_new (int, n);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
a[i] = g_test_rand_int (); a[i] = g_test_rand_int ();
b = g_memdup (a, sizeof (int) * n); b = g_memdup2 (a, sizeof (int) * n);
gtk_tim_sort_init (&sort, a, n, sizeof (int), compare_int, NULL); gtk_tim_sort_init (&sort, a, n, sizeof (int), compare_int, NULL);
gtk_tim_sort_set_max_merge_size (&sort, g_test_rand_int_range (512, 2048)); gtk_tim_sort_set_max_merge_size (&sort, g_test_rand_int_range (512, 2048));