projects
/
oweals
/
musl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix memset overflow in oldmalloc race fix overhaul
[oweals/musl.git]
/
src
/
malloc
/
oldmalloc
/
malloc.c
diff --git
a/src/malloc/oldmalloc/malloc.c
b/src/malloc/oldmalloc/malloc.c
index 0a38690c628a584a2820f268bb49fa33afc8a61f..52af19759171d28514470a4e3afe96ab28ed4d49 100644
(file)
--- a/
src/malloc/oldmalloc/malloc.c
+++ b/
src/malloc/oldmalloc/malloc.c
@@
-409,7
+409,7
@@
copy_realloc:
new = malloc(n-OVERHEAD);
if (!new) return 0;
copy_free_ret:
- memcpy(new, p,
n0-
OVERHEAD);
+ memcpy(new, p,
(n<n0 ? n : n0) -
OVERHEAD);
free(CHUNK_TO_MEM(self));
return new;
}