summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2014-04-16 07:53:58 -0400
committerRyan Lortie <desrt@desrt.ca>2014-04-16 07:53:58 -0400
commitd93458d97d74ef12a08de20c1f27ea1cfa54447f (patch)
tree180932886be3fb0af5ef0e9a39f060aa9a4b87c1 /glib
parentc49ec3c8d7a90589308ce1b87a92bc627335ffd2 (diff)
Revert "Bug 724590 - GSlice slab_stack corruption"
Diffstat (limited to 'glib')
-rw-r--r--glib/gslice.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/glib/gslice.c b/glib/gslice.c
index 2c5f4fb59..0563d8092 100644
--- 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);