[glibc] 01/01: Use the actually-submitted patch
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.24
in repository glibc.
commit 2f727913b2d33885d1be920282929203a1aaddbc
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Jul 6 21:38:36 2016 +0200
Use the actually-submitted patch
---
.../hurd-i386/submitted-malloc-setstate.diff | 42 ++++++++++++++++++++--
1 file changed, 40 insertions(+), 2 deletions(-)
diff --git a/debian/patches/hurd-i386/submitted-malloc-setstate.diff b/debian/patches/hurd-i386/submitted-malloc-setstate.diff
index 31d72ca..cb2493b 100644
--- a/debian/patches/hurd-i386/submitted-malloc-setstate.diff
+++ b/debian/patches/hurd-i386/submitted-malloc-setstate.diff
@@ -1,8 +1,46 @@
+https://sourceware.org/ml/libc-alpha/2016-07/msg00175.html
+
diff --git a/malloc/malloc.c b/malloc/malloc.c
-index 1f5f166..8fa49e0 100644
+index 1f5f166..beb97e9 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
-@@ -2682,6 +2685,7 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
+@@ -2600,13 +2600,12 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
+ {
+ /*
+ Skip over some bytes to arrive at an aligned position.
+- We don't need to specially mark these wasted front bytes.
+- They will never be accessed anyway because
+- prev_inuse of av->top (and any chunk created from its start)
+- is always true after initialization.
++ We zero them for malloc_set_state to properly find the
++ first chunk.
+ */
+
+ correction = MALLOC_ALIGNMENT - front_misalign;
++ memset (brk, 0, correction);
+ aligned_brk += correction;
+ }
+
+@@ -2661,13 +2660,13 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
+ {
+ /*
+ Skip over some bytes to arrive at an aligned position.
+- We don't need to specially mark these wasted front bytes.
+- They will never be accessed anyway because
+- prev_inuse of av->top (and any chunk created from its start)
+- is always true after initialization.
++ We zero them for malloc_set_state to properly find
++ the first chunk.
+ */
+
+- aligned_brk += MALLOC_ALIGNMENT - front_misalign;
++ correction = MALLOC_ALIGNMENT - front_misalign;
++ memset (brk, 0, correction);
++ aligned_brk += correction;
+ }
+ }
+
+@@ -2682,6 +2681,7 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
if (snd_brk != (char *) (MORECORE_FAILURE))
{
av->top = (mchunkptr) aligned_brk;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: