ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 02:46:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt to fix m_free for libtomcrypt/libtommath

Browse Source
This commit is contained in:
Matt Johnston 2018-03-02 00:02:06 +08:00
parent 5bd0c0d25a
commit e612aec5d9
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbmalloc.h
View File

@ -1,7 +1,9 @@
#ifndef DBMALLOC_H_
#define DBMALLOC_H_
#include "includes.h"
#include "stdint.h"
#include "stdlib.h"
#include "options.h"
void * m_malloc(size_t size);
void * m_calloc(size_t nmemb, size_t size);
@ -10,16 +12,16 @@ void * m_realloc(void* ptr, size_t size);
#if DROPBEAR_TRACKING_MALLOC
void m_free_direct(void* ptr);
#define m_free(X) do {m_free_direct(X); (X) = NULL;} while (0)
void m_malloc_set_epoch(unsigned int epoch);
void m_malloc_free_epoch(unsigned int epoch, int dofree);
#else
/* plain wrapper */
#define m_free(X) do {free(X); (X) = NULL;} while (0)
#define m_free_direct free
#endif
#define m_free(X) do {m_free_direct(X); (X) = NULL;} while (0)
#endif /* DBMALLOC_H_ */

7
libtomcrypt/src/headers/tomcrypt_custom.h
View File

@ -12,12 +12,7 @@
#include "tomcrypt_dropbear.h"
void * m_malloc(size_t size);
/* m_calloc is limited in size, enough for libtomcrypt */
void * m_calloc(size_t nmemb, size_t size);
void * m_realloc(void* ptr, size_t size);
void m_free_direct(void* ptr);
#include "dbmalloc.h"
#define XMALLOC m_malloc
#define XFREE m_free_direct
#define XREALLOC m_realloc

7
libtommath/tommath_class.h
View File

@ -1062,12 +1062,7 @@
#undef BN_MP_TOOM_MUL_C
#undef BN_MP_TOOM_SQR_C
void * m_malloc(size_t size);
/* m_calloc is limited in size, enough for libtomcrypt */
void * m_calloc(size_t nmemb, size_t size);
void * m_realloc(void* ptr, size_t size);
void m_free_direct(void* ptr);
#include "dbmalloc.h"
#define XMALLOC m_malloc
#define XFREE m_free_direct
#define XREALLOC m_realloc