aboutsummaryrefslogtreecommitdiffstats
path: root/src/gmalloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gmalloc.c')
-rw-r--r--src/gmalloc.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index fc728eeea7e..c50df25cd41 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1307,8 +1307,8 @@ special_realloc (void *ptr, size_t size)
1307 type == 0 ? bss_sbrk_heapinfo[block].busy.info.size * BLOCKSIZE 1307 type == 0 ? bss_sbrk_heapinfo[block].busy.info.size * BLOCKSIZE
1308 : (size_t) 1 << type; 1308 : (size_t) 1 << type;
1309 result = _malloc_internal_nolock (size); 1309 result = _malloc_internal_nolock (size);
1310 if (result != NULL) 1310 if (result)
1311 memcpy (result, ptr, min (oldsize, size)); 1311 return memcpy (result, ptr, min (oldsize, size));
1312 return result; 1312 return result;
1313} 1313}
1314#endif 1314#endif
@@ -1501,7 +1501,7 @@ calloc (size_t nmemb, size_t size)
1501 1501
1502 result = malloc (bytes); 1502 result = malloc (bytes);
1503 if (result) 1503 if (result)
1504 memset (result, 0, bytes); 1504 return memset (result, 0, bytes);
1505 return result; 1505 return result;
1506} 1506}
1507/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 1507/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
@@ -1814,8 +1814,7 @@ mallochook (size_t size)
1814 hdr->size = size; 1814 hdr->size = size;
1815 hdr->magic = MAGICWORD; 1815 hdr->magic = MAGICWORD;
1816 ((char *) &hdr[1])[size] = MAGICBYTE; 1816 ((char *) &hdr[1])[size] = MAGICBYTE;
1817 memset (hdr + 1, MALLOCFLOOD, size); 1817 return memset (hdr + 1, MALLOCFLOOD, size);
1818 return hdr + 1;
1819} 1818}
1820 1819
1821static void * 1820static void *