[PATCH 05/10] malloc: Resolve compilation failure in NDEBUG mode
Siddhesh Poyarekar
siddhesh@sourceware.org
Sun Jan 1 00:00:00 GMT 2017
From: Florian Weimer <fweimer@redhat.com>
In _int_free, the locked variable is not used if NDEBUG is defined.
(cherry-picked from 24cffce7366c4070d8f823702a4fcec2cb732595)
---
ChangeLog | 5 +++++
malloc/malloc.c | 25 +++++++------------------
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 519db42..d536c9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2017-08-31 Florian Weimer <fweimer@redhat.com>
+ * malloc/malloc.c (_int_free): Remove locked variable and related
+ asserts.
+
+2017-08-31 Florian Weimer <fweimer@redhat.com>
+
* malloc/malloc.c (top_check): Change return type to void. Remove
internal_function.
* malloc/hooks.c (top_check): Likewise.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 417ffbb..3608b34 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4097,8 +4097,6 @@ _int_free (mstate av, mchunkptr p, int have_lock)
mchunkptr bck; /* misc temp for linking */
mchunkptr fwd; /* misc temp for linking */
- int locked = 0;
-
size = chunksize (p);
/* Little security check which won't hurt performance: the
@@ -4153,19 +4151,14 @@ _int_free (mstate av, mchunkptr p, int have_lock)
/* We might not have a lock at this point and concurrent modifications
of system_mem might have let to a false positive. Redo the test
after getting the lock. */
- if (have_lock
- || ({ assert (locked == 0);
- __libc_lock_lock (av->mutex);
- locked = 1;
+ if (!have_lock
+ || ({ __libc_lock_lock (av->mutex);
chunksize_nomask (chunk_at_offset (p, size)) <= 2 * SIZE_SZ
- || chunksize (chunk_at_offset (p, size)) >= av->system_mem;
- }))
+ || chunksize (chunk_at_offset (p, size)) >= av->system_mem;
+ }))
malloc_printerr ("free(): invalid next size (fast)");
if (! have_lock)
- {
- __libc_lock_unlock (av->mutex);
- locked = 0;
- }
+ __libc_lock_unlock (av->mutex);
}
free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
@@ -4202,10 +4195,8 @@ _int_free (mstate av, mchunkptr p, int have_lock)
*/
else if (!chunk_is_mmapped(p)) {
- if (! have_lock) {
+ if (!have_lock)
__libc_lock_lock (av->mutex);
- locked = 1;
- }
nextchunk = chunk_at_offset(p, size);
@@ -4319,10 +4310,8 @@ _int_free (mstate av, mchunkptr p, int have_lock)
}
}
- if (! have_lock) {
- assert (locked);
+ if (!have_lock)
__libc_lock_unlock (av->mutex);
- }
}
/*
If the chunk was allocated via mmap, release via munmap().
--
2.7.5
More information about the Libc-stable
mailing list