about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorAyush Mittal <ayush.m@samsung.com>2021-04-08 14:59:09 +0530
committerDJ Delorie <dj@redhat.com>2023-02-22 16:56:45 -0500
commit3f84f1159e9f3e9716eae46ba88616bb153fdd8c (patch)
treef1c2fe54cea112ea9f6ab01329f0b536b88aad37 /malloc
parenteb63ccc0ce6a3a7f2c397d305233c876e8dc1632 (diff)
downloadglibc-3f84f1159e9f3e9716eae46ba88616bb153fdd8c.tar.gz
glibc-3f84f1159e9f3e9716eae46ba88616bb153fdd8c.tar.xz
glibc-3f84f1159e9f3e9716eae46ba88616bb153fdd8c.zip
malloc: remove redundant check of unsorted bin corruption
* malloc/malloc.c (_int_malloc): remove redundant check of
  unsorted bin corruption

With commit "b90ddd08f6dd688e651df9ee89ca3a69ff88cd0c"
(malloc: Additional checks for unsorted bin integrity),
same check of (bck->fd != victim) is added before checking of unsorted
chunk corruption, which was added in "bdc3009b8ff0effdbbfb05eb6b10966753cbf9b8"
(Added check before removing from unsorted list).

..
3773           if (__glibc_unlikely (bck->fd != victim)
3774               || __glibc_unlikely (victim->fd != unsorted_chunks (av)))
3775             malloc_printerr ("malloc(): unsorted double linked list corrupted");
..
..
3815           /* remove from unsorted list */
3816          if (__glibc_unlikely (bck->fd != victim))
3817            malloc_printerr ("malloc(): corrupted unsorted chunks 3");
3818          unsorted_chunks (av)->bk = bck;
..

So this extra check can be removed.

Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
Signed-off-by: Ayush Mittal <ayush.m@samsung.com>
Reviewed-by: DJ Delorie <dj@redhat.com>
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index fd8b52bfac..5829f3fa9b 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4034,8 +4034,6 @@ _int_malloc (mstate av, size_t bytes)
             }
 
           /* remove from unsorted list */
-          if (__glibc_unlikely (bck->fd != victim))
-            malloc_printerr ("malloc(): corrupted unsorted chunks 3");
           unsorted_chunks (av)->bk = bck;
           bck->fd = unsorted_chunks (av);