aboutsummaryrefslogtreecommitdiffstats
path: root/main/musl/0056-fix-undefined-behavior-in-free.patch
blob: cccf2db4c0abea6111a3d7d9ad91a7be9141b1b1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
From 60ab365cae24063b0f21821860ca16fb63e81f81 Mon Sep 17 00:00:00 2001
From: Alexander Monakov <amonakov@ispras.ru>
Date: Tue, 27 Jun 2017 20:58:47 +0300
Subject: [PATCH 56/56] fix undefined behavior in free

---
 src/malloc/malloc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c
index d5ee4280..9e05e1d6 100644
--- a/src/malloc/malloc.c
+++ b/src/malloc/malloc.c
@@ -450,14 +450,15 @@ copy_realloc:
 
 void free(void *p)
 {
-	struct chunk *self = MEM_TO_CHUNK(p);
-	struct chunk *next;
+	struct chunk *self, *next;
 	size_t final_size, new_size, size;
 	int reclaim=0;
 	int i;
 
 	if (!p) return;
 
+	self = MEM_TO_CHUNK(p);
+
 	if (IS_MMAPPED(self)) {
 		size_t extra = self->psize;
 		char *base = (char *)self - extra;
-- 
2.13.1