--- ../asn1c/skeletons/asn_internal.h 2015-08-31 09:29:45.590924282 +0200 +++ include/asn1c/asn_internal.h 2015-08-31 09:26:17.461872713 +0200 @@ -15,6 +15,8 @@ #include /* for assert() macro */ #endif +#include + #ifdef __cplusplus extern "C" { #endif @@ -23,10 +25,12 @@ #define ASN1C_ENVIRONMENT_VERSION 924 /* Compile-time version */ int get_asn1c_environment_version(void); /* Run-time version */ -#define CALLOC(nmemb, size) calloc(nmemb, size) -#define MALLOC(size) malloc(size) -#define REALLOC(oldptr, size) realloc(oldptr, size) -#define FREEMEM(ptr) free(ptr) +extern void *talloc_asn1_ctx; + +#define CALLOC(nmemb, size) talloc_zero_size(talloc_asn1_ctx, (nmemb) * (size)) +#define MALLOC(size) talloc_size(talloc_asn1_ctx, size) +#define REALLOC(oldptr, size) talloc_realloc_size(talloc_asn1_ctx, oldptr, size) +#define FREEMEM(ptr) talloc_free(ptr) #define asn_debug_indent 0 #define ASN_DEBUG_INDENT_ADD(i) do{}while(0)