One indirection level too little compared to the

pre-CRYPTO_MEM_LEAK_CB time.

diff --git a/crypto/crypto.h b/crypto/crypto.h
index bcbaee4f9b03fc1da5dbf9e8e1ba1ae99f18abf7..af678a7489fa5c525f7855d629ef54faf5bb0499 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -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);
 

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 3c559e09960342b3f1325a7975244ac1d94f0641..5086bcde15c4457c1a525d58bf48ed9138087911 100644 (file)
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -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);