mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 02:03:35 +08:00
Update.
2004-12-09 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (public_rEALLOc): Add parameter checks. (_int_free): Provide better error message for invalid pointers.
This commit is contained in:
parent
bf7c04cd5f
commit
dc165f7b0b
@ -1,3 +1,8 @@
|
||||
2004-12-09 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* malloc/malloc.c (public_rEALLOc): Add parameter checks.
|
||||
(_int_free): Provide better error message for invalid pointers.
|
||||
|
||||
2004-12-01 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* posix/tst-regex.c: Use defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
|
||||
|
@ -1,3 +1,20 @@
|
||||
2004-12-01 Jakub Jelinek <jakub@redhat.coM.
|
||||
|
||||
* sysdeps/unix/sysv/linux/bits/posix_opt.h (_POSIX_CPUTIME,
|
||||
_POSIX_THREAD_CPUTIME): Define to 0.
|
||||
* sysdeps/pthread/timer_create.c (timer_create): Remove unused code
|
||||
handling CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID.
|
||||
* sysdeps/pthread/timer_routines.c (__timer_signal_thread_pclk,
|
||||
__timer_signal_thread_tclk): Remove.
|
||||
(init_module): Remove their initialization.
|
||||
(thread_cleanup): Remove their cleanup assertions.
|
||||
* sysdeps/pthread/posix-timer.h (__timer_signal_thread_pclk,
|
||||
__timer_signal_thread_tclk): Remove.
|
||||
* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Removed.
|
||||
* sysdeps/unix/sysv/linux/ia64/bits/posix_opt.h: Removed.
|
||||
* sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h: Removed.
|
||||
* tst-clock1.c (do_test): Check for availability of CPU clock.
|
||||
|
||||
2004-11-18 Daniel Jacobowitz <dan@codesourcery.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Update RETINSTR use.
|
||||
|
@ -3434,6 +3434,17 @@ public_rEALLOc(Void_t* oldmem, size_t bytes)
|
||||
oldp = mem2chunk(oldmem);
|
||||
oldsize = chunksize(oldp);
|
||||
|
||||
/* Little security check which won't hurt performance: the
|
||||
allocator never wrapps around at the end of the address space.
|
||||
Therefore we can exclude some size values which might appear
|
||||
here by accident or by "design" from some intruder. */
|
||||
if (__builtin_expect ((uintptr_t) oldp > (uintptr_t) -oldsize, 0)
|
||||
|| __builtin_expect ((uintptr_t) oldp & MALLOC_ALIGN_MASK, 0))
|
||||
{
|
||||
malloc_printerr (check_action, "realloc(): invalid pointer", oldmem);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
checked_request2size(bytes, nb);
|
||||
|
||||
#if HAVE_MMAP
|
||||
@ -4205,7 +4216,6 @@ _int_free(mstate av, Void_t* mem)
|
||||
mchunkptr bck; /* misc temp for linking */
|
||||
mchunkptr fwd; /* misc temp for linking */
|
||||
|
||||
|
||||
const char *errstr = NULL;
|
||||
|
||||
p = mem2chunk(mem);
|
||||
@ -4215,7 +4225,8 @@ _int_free(mstate av, Void_t* mem)
|
||||
allocator never wrapps around at the end of the address space.
|
||||
Therefore we can exclude some size values which might appear
|
||||
here by accident or by "design" from some intruder. */
|
||||
if (__builtin_expect ((uintptr_t) p > (uintptr_t) -size, 0))
|
||||
if (__builtin_expect ((uintptr_t) p > (uintptr_t) -size, 0)
|
||||
|| __builtin_expect ((uintptr_t) p & MALLOC_ALIGN_MASK, 0))
|
||||
{
|
||||
errstr = "free(): invalid pointer";
|
||||
errout:
|
||||
|
Loading…
Reference in New Issue
Block a user