honour g_mem_gc_friendly settings when freeing slices, make sure

[platform/upstream/glib.git] / tests / slice-test.c

diff --git a/tests/slice-test.c b/tests/slice-test.c
index f0b5b20..9c39b66 100644 (file)
--- a/tests/slice-test.c
+++ b/tests/slice-test.c
@@ -70,6 +70,10 @@ memchunk_free (GMemChunk *memchunk,
 static gpointer
 test_memchunk_thread (gpointer data)
 {
+  GMemChunk **memchunks;
+  guint i, j;
+  guint8 **ps;
+  guint   *ss;
   guint32 rand_accu = 2147483563;
   /* initialize random numbers */
   if (data)
@@ -82,12 +86,11 @@ test_memchunk_thread (gpointer data)
     }
 
   /* prepare for memchunk creation */
-  GMemChunk **memchunks = g_alloca (sizeof (memchunks[0]) * prime_size);
+  memchunks = g_alloca (sizeof (memchunks[0]) * prime_size);
   memset (memchunks, 0, sizeof (memchunks[0]) * prime_size);
 
-  guint i, j;
-  guint8 **ps = g_new (guint8*, number_of_blocks);
-  guint   *ss = g_new (guint, number_of_blocks);
+  ps = g_new (guint8*, number_of_blocks);
+  ss = g_new (guint, number_of_blocks);
   /* create number_of_blocks random sizes */
   for (i = 0; i < number_of_blocks; i++)
     ss[i] = quick_rand32() % prime_size;
@@ -123,6 +126,8 @@ test_memchunk_thread (gpointer data)
   for (i = 0; i < prime_size; i++)
     if (memchunks[i])
       old_mem_chunk_destroy (memchunks[i]);
+  g_free (ps);
+  g_free (ss);
 
   return NULL;
 }
@@ -175,6 +180,8 @@ test_sliced_mem_thread (gpointer data)
       for (j = 0; j < k; j++)
         g_slice_free1 (sz, ps[j]);
     }
+  g_free (ps);
+  g_free (ss);
 
   return NULL;
 }