Commit 32654e79 authored by Richard Levitte's avatar Richard Levitte
Browse files

One indirection level too little compared to the 

pre-CRYPTO_MEM_LEAK_CB time.
parent 19f21921

crypto/crypto.h

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ void CRYPTO_mem_leaks_fp(FILE *); 
void CRYPTO_mem_leaks(struct bio_st *bio);

/* unsigned long order, char *file, int line, int num_bytes, char *addr */

typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *);

void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB cb);

void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);



void ERR_load_CRYPTO_strings(void);

crypto/mem_dbg.c

+3 −3
Original line number Diff line number Diff line
@@ -753,14 +753,14 @@ void CRYPTO_mem_leaks_fp(FILE *fp) 
/* NB: The prototypes have been typedef'd to CRYPTO_MEM_LEAK_CB inside crypto.h

 * If this code is restructured, remove the callback type if it is no longer

 * needed. -- Geoff Thorpe */

static void cb_leak(MEM *m, CRYPTO_MEM_LEAK_CB *cb)

static void cb_leak(MEM *m, CRYPTO_MEM_LEAK_CB **cb)

	{

	(**cb)(m->order,m->file,m->line,m->num,m->addr);

	}



static IMPLEMENT_LHASH_DOALL_ARG_FN(cb_leak, MEM *, CRYPTO_MEM_LEAK_CB *)

static IMPLEMENT_LHASH_DOALL_ARG_FN(cb_leak, MEM *, CRYPTO_MEM_LEAK_CB **)



void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB cb)

void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb)

	{

	if (mh == NULL) return;

	CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2);