feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #1726 from ejohnstown/memcb-test

Browse Source 
memory callback test fix
This commit is contained in:
David Garske
2018-08-01 10:05:14 -07:00
committed by GitHub
parent 2b3f94944d 50372b7033
commit a72cbcf8eb
4 changed files with 15 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wolfcrypt/src/memory.c
View File

@ -66,33 +66,9 @@ int wolfSSL_SetAllocators(wolfSSL_Malloc_cb mf,
wolfSSL_Free_cb ff, wolfSSL_Free_cb ff,
wolfSSL_Realloc_cb rf) wolfSSL_Realloc_cb rf)
{ {
int res = 0; malloc_function = mf;
free_function = ff;
if (mf) realloc_function = rf;
malloc_function = mf;
else
res = BAD_FUNC_ARG;
if (ff)
free_function = ff;
else
res = BAD_FUNC_ARG;
if (rf)
realloc_function = rf;
else
res = BAD_FUNC_ARG;
return res;
}
int wolfSSL_ResetAllocators(void)
{
/* allow nulls to be set for callbacks to restore defaults */
malloc_function = NULL;
free_function = NULL;
realloc_function = NULL;
return 0; return 0;
} }

14
wolfcrypt/test/test.c
View File

@ -19585,20 +19585,6 @@ int memcb_test(void)
XFREE(b, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(b, NULL, DYNAMIC_TYPE_TMP_BUFFER);
b = NULL; b = NULL;
/* Parameter Validation testing. */
if (wolfSSL_SetAllocators(NULL, (wolfSSL_Free_cb)&my_Free_cb,
(wolfSSL_Realloc_cb)&my_Realloc_cb) != BAD_FUNC_ARG) {
ERROR_OUT(-10002, exit_memcb);
}
if (wolfSSL_SetAllocators((wolfSSL_Malloc_cb)&my_Malloc_cb, NULL,
(wolfSSL_Realloc_cb)&my_Realloc_cb) != BAD_FUNC_ARG) {
ERROR_OUT(-10003, exit_memcb);
}
if (wolfSSL_SetAllocators((wolfSSL_Malloc_cb)&my_Malloc_cb,
(wolfSSL_Free_cb)&my_Free_cb, NULL) != BAD_FUNC_ARG) {
ERROR_OUT(-10004, exit_memcb);
}
/* Use API. */ /* Use API. */
if (wolfSSL_SetAllocators((wolfSSL_Malloc_cb)&my_Malloc_cb, if (wolfSSL_SetAllocators((wolfSSL_Malloc_cb)&my_Malloc_cb,
(wolfSSL_Free_cb)&my_Free_cb, (wolfSSL_Realloc_cb)my_Realloc_cb) != 0) { (wolfSSL_Free_cb)&my_Free_cb, (wolfSSL_Realloc_cb)my_Realloc_cb) != 0) {

14
wolfssl/wolfcrypt/mem_track.h
View File

@ -308,9 +308,19 @@
} }
#ifdef WOLFSSL_TRACK_MEMORY #ifdef WOLFSSL_TRACK_MEMORY
static wolfSSL_Malloc_cb mfDefault = NULL;
static wolfSSL_Free_cb ffDefault = NULL;
static wolfSSL_Realloc_cb rfDefault = NULL;
STATIC WC_INLINE int InitMemoryTracker(void) STATIC WC_INLINE int InitMemoryTracker(void)
{ {
int ret = wolfSSL_SetAllocators(TrackMalloc, TrackFree, TrackRealloc); int ret;
ret = wolfSSL_GetAllocators(&mfDefault, &ffDefault, &rfDefault);
if (ret < 0) {
printf("wolfSSL GetAllocators failed to get the defaults\n");
}
ret = wolfSSL_SetAllocators(TrackMalloc, TrackFree, TrackRealloc);
if (ret < 0) { if (ret < 0) {
printf("wolfSSL SetAllocators failed for track memory\n"); printf("wolfSSL SetAllocators failed for track memory\n");
return ret; return ret;
@ -380,7 +390,7 @@
STATIC WC_INLINE int CleanupMemoryTracker(void) STATIC WC_INLINE int CleanupMemoryTracker(void)
{ {
/* restore default allocators */ /* restore default allocators */
return wolfSSL_ResetAllocators(); return wolfSSL_SetAllocators(mfDefault, ffDefault, rfDefault);
} }
#endif #endif

1
wolfssl/wolfcrypt/memory.h
View File

@ -81,7 +81,6 @@
WOLFSSL_API int wolfSSL_SetAllocators(wolfSSL_Malloc_cb, WOLFSSL_API int wolfSSL_SetAllocators(wolfSSL_Malloc_cb,
wolfSSL_Free_cb, wolfSSL_Free_cb,
wolfSSL_Realloc_cb); wolfSSL_Realloc_cb);
WOLFSSL_API int wolfSSL_ResetAllocators(void);
WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb*, WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb*,
wolfSSL_Free_cb*, wolfSSL_Free_cb*,
wolfSSL_Realloc_cb*); wolfSSL_Realloc_cb*);