WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

realloc improvements

pull/1997/head
Tesfa Mael 2019-01-22 19:21:51 -08:00
parent 5ce6a9009e
commit 2fa8e8bb94
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IDE/ECLIPSE/DEOS/deos_malloc.c
View File

@ -22,6 +22,7 @@
#include <wolfssl/ssl.h> #include <wolfssl/ssl.h>
#define ROUND_UP(x, align) (((int) (x) + (align - 1)) & ~(align - 1)) #define ROUND_UP(x, align) (((int) (x) + (align - 1)) & ~(align - 1))
#define SIZEOF_HEADER sizeof(size_t) /* tracks size of allocated block */
#define HEAP_SIZE_MAX (1*1024*1024) #define HEAP_SIZE_MAX (1*1024*1024)
@ -47,10 +48,13 @@ void *realloc_deos(void *ptr, size_t size) {
if (size == 0) if (size == 0)
return ptr; return ptr;
newptr = malloc_deos(size); newptr = malloc_deos(size);
if (ptr != NULL && newptr != NULL) { if (ptr != NULL && newptr != NULL) {
if ( *((size_t*)ptr - SIZEOF_HEADER) < *((size_t*)newptr - SIZEOF_HEADER))
size = *((size_t*)ptr - SIZEOF_HEADER);
XMEMCPY((char *) newptr, (const char *) ptr, size); XMEMCPY((char *) newptr, (const char *) ptr, size);
free_deos(ptr); free_deos(ptr);
} }
@ -88,11 +92,13 @@ void *malloc_deos(size_t size) {
size = ROUND_UP(size, sizeof(size_t)); size = ROUND_UP(size, sizeof(size_t));
if (size > (HEAP_SIZE_MAX - (freeAddr - heapAddr))){ if ((size + SIZEOF_HEADER) > (HEAP_SIZE_MAX - (freeAddr - heapAddr))){
printf("ERROR: malloc_deos cannot allocate from heap memory anymore\n"); printf("ERROR: malloc_deos cannot allocate from heap memory anymore\n");
return NULL; return NULL;
} }
*freeAddr = size;
freeAddr += SIZEOF_HEADER;
retAddr = freeAddr; retAddr = freeAddr;
XMEMSET(retAddr, 0, size); XMEMSET(retAddr, 0, size);
freeAddr += size; freeAddr += size;