aboutsummaryrefslogtreecommitdiff
path: root/malloc/hooks.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-16 12:07:56 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-16 12:07:56 -0500
commitd77e786926ef8d4af55d978b86cc525e7366acd7 (patch)
treee8f9df7153d7df6adfe0780413557cd9221d2e73 /malloc/hooks.c
parent400aa020ea599b4319670a1cea7028930aeab588 (diff)
downloadglibc-d77e786926ef8d4af55d978b86cc525e7366acd7.tar
glibc-d77e786926ef8d4af55d978b86cc525e7366acd7.tar.gz
glibc-d77e786926ef8d4af55d978b86cc525e7366acd7.tar.bz2
glibc-d77e786926ef8d4af55d978b86cc525e7366acd7.zip
Minor cleanups of malloc code
Diffstat (limited to 'malloc/hooks.c')
-rw-r--r--malloc/hooks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/malloc/hooks.c b/malloc/hooks.c
index fc46e7d95a..e38644d35c 100644
--- a/malloc/hooks.c
+++ b/malloc/hooks.c
@@ -1,5 +1,5 @@
/* Malloc implementation for multiple threads without lock contention.
- Copyright (C) 2001-2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2001-2009, 2011, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
@@ -98,7 +98,7 @@ internal_function
mem2mem_check(void *ptr, size_t sz)
{
mchunkptr p;
- unsigned char* m_ptr = (unsigned char*)BOUNDED_N(ptr, sz);
+ unsigned char* m_ptr = ptr;
size_t i;
if (!ptr)
@@ -302,7 +302,7 @@ realloc_check(void* oldmem, size_t bytes, const void *caller)
if (top_check() >= 0)
newmem = _int_malloc(&main_arena, bytes+1);
if (newmem) {
- MALLOC_COPY(BOUNDED_N(newmem, bytes+1), oldmem, oldsize - 2*SIZE_SZ);
+ MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ);
munmap_chunk(oldp);
}
}