Revert "Bug 724590 - GSlice slab_stack corruption"

This reverts commit c49ec3c8d7a90589308ce1b87a92bc627335ffd2.

diff --git a/glib/gslice.c b/glib/gslice.c
index 2c5f4fb599adb5978c0e6808dd69fc9e232af04f..0563d8092dd173d3907dcea8f46d41243da9b211 100644 (file)
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -715,8 +715,7 @@ static ChunkLink*
 magazine_cache_pop_magazine (guint  ix,
                              gsize *countp)
 {
-  guint *counters = allocator->contention_counters;
-  g_mutex_lock_a (&allocator->magazine_mutex, &counters[ix]);
+  g_mutex_lock_a (&allocator->magazine_mutex, &allocator->contention_counters[ix]);
   if (!allocator->magazines[ix])
     {
       guint magazine_threshold = allocator_get_magazine_threshold (allocator, ix);