[glib] Revert "Bug 724590 - GSlice slab_stack corruption"
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Revert "Bug 724590 - GSlice slab_stack corruption"
- Date: Wed, 16 Apr 2014 11:54:08 +0000 (UTC)
commit d93458d97d74ef12a08de20c1f27ea1cfa54447f
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Apr 16 07:53:58 2014 -0400
Revert "Bug 724590 - GSlice slab_stack corruption"
This reverts commit c49ec3c8d7a90589308ce1b87a92bc627335ffd2.
glib/gslice.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/glib/gslice.c b/glib/gslice.c
index 2c5f4fb..0563d80 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]