[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r3841 - glibc-package/trunk/debian/patches/hurd-i386



Author: sthibault
Date: 2009-09-15 08:40:23 +0000 (Tue, 15 Sep 2009)
New Revision: 3841

Modified:
   glibc-package/trunk/debian/patches/hurd-i386/submitted-sbrk.diff
Log:
fix non-initialized err variable

Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-sbrk.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-sbrk.diff	2009-09-14 23:58:28 UTC (rev 3840)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-sbrk.diff	2009-09-15 08:40:23 UTC (rev 3841)
@@ -1,16 +1,27 @@
 2009-09-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
-        * sysdeps/mach/hurd/brk.c (_hurd_set_brk): Pass a copy of _hurd_data_end
-        instead of pagebrk to __vm_allocate.
+        * sysdeps/mach/hurd/brk.c (_hurd_set_brk): When more space needs to be
+        allocated, call __vm_protect to finish enabling the existing space, and
+        pass a copy of _hurd_data_end instead of pagebrk to __vm_allocate to
+        allocate the remainder.
 
 ---
- brk.c |   16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
+ brk.c |   18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/sysdeps/mach/hurd/brk.c b/sysdeps/mach/hurd/brk.c
-index 931b260..678b1bb 100644
+index 931b260..4a135d3 100644
 --- a/sysdeps/mach/hurd/brk.c
 +++ b/sysdeps/mach/hurd/brk.c
+@@ -64,7 +64,7 @@ weak_alias (__brk, brk)
+ int
+ _hurd_set_brk (vm_address_t addr)
+ {
+-  error_t err;
++  error_t err = 0;
+   vm_address_t pagend = round_page (addr);
+   vm_address_t pagebrk = round_page (_hurd_brk);
+   long int rlimit;
 @@ -101,8 +101,22 @@ _hurd_set_brk (vm_address_t addr)
  
    if (pagend > _hurd_data_end)


Reply to: