wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for using track memory feature with FreeRTOS.

Browse Source
This commit is contained in:
David Garske
2022-06-27 13:53:14 -07:00
parent 94e7eacc5f
commit 31498de7a9
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfssl/wolfcrypt/mem_track.h
View File

@ -158,7 +158,11 @@
if (sz == 0) if (sz == 0)
return NULL; return NULL;
#ifdef FREERTOS
mt = (memoryTrack*)pvPortMalloc(sizeof(memoryTrack) + sz);
#else
mt = (memoryTrack*)malloc(sizeof(memoryTrack) + sz); mt = (memoryTrack*)malloc(sizeof(memoryTrack) + sz);
#endif
if (mt == NULL) if (mt == NULL)
return NULL; return NULL;
@ -284,7 +288,11 @@
#endif #endif
(void)sz; (void)sz;
#ifdef FREERTOS
vPortFree(mt);
#else
free(mt); free(mt);
#endif
} }

2
wolfssl/wolfcrypt/settings.h
View File

@ -795,7 +795,7 @@ extern void uITRON4_free(void *p) ;
#include "FreeRTOS.h" #include "FreeRTOS.h"
#if !defined(XMALLOC_USER) && !defined(NO_WOLFSSL_MEMORY) && \ #if !defined(XMALLOC_USER) && !defined(NO_WOLFSSL_MEMORY) && \
!defined(WOLFSSL_STATIC_MEMORY) !defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_TRACK_MEMORY)
#define XMALLOC(s, h, type) pvPortMalloc((s)) #define XMALLOC(s, h, type) pvPortMalloc((s))
#define XFREE(p, h, type) vPortFree((p)) #define XFREE(p, h, type) vPortFree((p))
/* FreeRTOS pvPortRealloc() implementation can be found here: /* FreeRTOS pvPortRealloc() implementation can be found here:

2
wolfssl/wolfcrypt/types.h
View File

@ -495,7 +495,7 @@ typedef struct w64wrapper {
#endif #endif
#define XREALLOC(p, n, h, t) wolfSSL_Realloc((p), (n), (h), (t)) #define XREALLOC(p, n, h, t) wolfSSL_Realloc((p), (n), (h), (t))
#endif /* WOLFSSL_DEBUG_MEMORY */ #endif /* WOLFSSL_DEBUG_MEMORY */
#elif !defined(FREERTOS) && !defined(FREERTOS_TCP) #elif (!defined(FREERTOS) && !defined(FREERTOS_TCP)) || defined(WOLFSSL_TRACK_MEMORY)
#ifdef WOLFSSL_DEBUG_MEMORY #ifdef WOLFSSL_DEBUG_MEMORY
#define XMALLOC(s, h, t) ((void)(h), (void)(t), wolfSSL_Malloc((s), __func__, __LINE__)) #define XMALLOC(s, h, t) ((void)(h), (void)(t), wolfSSL_Malloc((s), __func__, __LINE__))
#ifdef WOLFSSL_XFREE_NO_NULLNESS_CHECK #ifdef WOLFSSL_XFREE_NO_NULLNESS_CHECK