diff options
| author | Matthew D Fleming <mdf@FreeBSD.org> | 2010-08-31 16:57:58 +0000 |
|---|---|---|
| committer | Matthew D Fleming <mdf@FreeBSD.org> | 2010-08-31 16:57:58 +0000 |
| commit | 6d3ed393d65a21a4ebd8aefbeb6d657d0a1f7815 (patch) | |
| tree | 52db48d2d45957d087b493ecb0f31698ab2834fd /sys/kern/kern_malloc.c | |
| parent | b2a237be5c4031f91743bde57571075ff388e497 (diff) | |
| download | src-6d3ed393d65a21a4ebd8aefbeb6d657d0a1f7815.tar.gz src-6d3ed393d65a21a4ebd8aefbeb6d657d0a1f7815.zip | |
Notes
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 00df9dd3ee43..1e97b55dc03b 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -566,11 +566,8 @@ realloc(void *addr, unsigned long size, struct malloc_type *mtp, int flags) */ #ifdef DEBUG_MEMGUARD - if (is_memguard_addr(addr)) { - slab = NULL; - alloc = size; - goto remalloc; - } + if (is_memguard_addr(addr)) + return (memguard_realloc(addr, size, mtp, flags)); #endif #ifdef DEBUG_REDZONE @@ -595,10 +592,6 @@ realloc(void *addr, unsigned long size, struct malloc_type *mtp, int flags) return (addr); #endif /* !DEBUG_REDZONE */ -#ifdef DEBUG_MEMGUARD -remalloc: -#endif - /* Allocate a new, bigger (or smaller) block */ if ((newaddr = malloc(size, mtp, flags)) == NULL) return (NULL); |