aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-08-20 14:57:13 +0200
committerArjun Shankar <arjun@redhat.com>2019-05-02 14:27:51 +0200
commit4d2477529236dadebfdd4f70b39226415ae9aac0 (patch)
treef3bec6c79bec6840f353983bef263634445352cc
parent5cbb73004b635e762e20b447c2d93c307cb40f41 (diff)
downloadglibc-4d2477529236dadebfdd4f70b39226415ae9aac0.tar
glibc-4d2477529236dadebfdd4f70b39226415ae9aac0.tar.gz
glibc-4d2477529236dadebfdd4f70b39226415ae9aac0.tar.bz2
glibc-4d2477529236dadebfdd4f70b39226415ae9aac0.zip
malloc: Add ChangeLog for accidentally committed change
Commit b90ddd08f6dd688e651df9ee89ca3a69ff88cd0c ("malloc: Additional checks for unsorted bin integrity I.") was committed without a whitespace fix, so it is adjusted here as well. (cherry picked from commit 35cfefd96062145eeb8aee6bd72d07e0909a6b2e)
-rw-r--r--ChangeLog4
-rw-r--r--malloc/malloc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 63917cc15d..c42b55f72f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-17 Istvan Kurucsai <pistukem@gmail.com>
+
+ * malloc/malloc.c (_int_malloc): Additional binning code checks.
+
2019-04-23 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[BZ #18035]
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 27cf6137c2..520a4faa7c 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3738,7 +3738,7 @@ _int_malloc (mstate av, size_t bytes)
if (__glibc_unlikely (bck->fd != victim)
|| __glibc_unlikely (victim->fd != unsorted_chunks (av)))
malloc_printerr ("malloc(): unsorted double linked list corrupted");
- if (__glibc_unlikely (prev_inuse(next)))
+ if (__glibc_unlikely (prev_inuse (next)))
malloc_printerr ("malloc(): invalid next->prev_inuse (unsorted)");
/*