1 files changed, 29 insertions, 37 deletions

diff --git a/src/lib/libcrypto/mem_dbg.c b/src/lib/libcrypto/mem_dbg.c
index a399485300..866c53e73a 100644
--- a/src/lib/libcrypto/mem_dbg.c
+++ b/src/lib/libcrypto/mem_dbg.c
@@ -108,7 +108,7 @@ static LHASH *amih=NULL; /* hash-table with those app_mem_info_st's
 typedef struct mem_st
 /* memory-block description */
         {
-        char *addr;
+        void *addr;
         int num;
         const char *file;
         int line;
@@ -221,7 +221,7 @@ long CRYPTO_dbg_get_options(void)
 
 static int mem_cmp(MEM *a, MEM *b)
         {
-        return(a->addr - b->addr);
+        return((char *)a->addr - (char *)b->addr);
         }
 
 static unsigned long mem_hash(MEM *a)
@@ -279,7 +279,7 @@ static APP_INFO *pop_info()
                                 ret->next = NULL;
                                 if (next != NULL)
                                         next->references--;
-                                Free(ret);
+                                OPENSSL_free(ret);
                                 }
                         }
                 }
@@ -295,7 +295,7 @@ int CRYPTO_push_info_(const char *info, const char *file, int line)
                 {
                 MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
 
-                if ((ami = (APP_INFO *)Malloc(sizeof(APP_INFO))) == NULL)
+                if ((ami = (APP_INFO *)OPENSSL_malloc(sizeof(APP_INFO))) == NULL)
                         {
                         ret=0;
                         goto err;
@@ -304,7 +304,7 @@ int CRYPTO_push_info_(const char *info, const char *file, int line)
                         {
                         if ((amih=lh_new(app_info_hash,app_info_cmp)) == NULL)
                                 {
-                                Free(ami);
+                                OPENSSL_free(ami);
                                 ret=0;
                                 goto err;
                                 }
@@ -386,9 +386,9 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
                 if (is_MemCheck_on())
                         {
                         MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
-                        if ((m=(MEM *)Malloc(sizeof(MEM))) == NULL)
+                        if ((m=(MEM *)OPENSSL_malloc(sizeof(MEM))) == NULL)
                                 {
-                                Free(addr);
+                                OPENSSL_free(addr);
                                 MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
                                 return;
                                 }
@@ -396,8 +396,8 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
                                 {
                                 if ((mh=lh_new(mem_hash,mem_cmp)) == NULL)
                                         {
-                                        Free(addr);
-                                        Free(m);
+                                        OPENSSL_free(addr);
+                                        OPENSSL_free(m);
                                         addr=NULL;
                                         goto err;
                                         }
@@ -445,7 +445,7 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
                                         {
                                         mm->app_info->references--;
                                         }
-                                Free(mm);
+                                OPENSSL_free(mm);
                                 }
                 err:
                         MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
@@ -481,7 +481,7 @@ void CRYPTO_dbg_free(void *addr, int before_p)
                                         {
                                         mp->app_info->references--;
                                         }
-                                Free(mp);
+                                OPENSSL_free(mp);
                                 }
 
                         MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
@@ -696,32 +696,6 @@ void CRYPTO_mem_leaks(BIO *b)
 #endif
         }
 
-union void_fn_to_char_u
-        {
-        char *char_p;
-        void (*fn_p)();
-        };
-
-static void cb_leak(MEM *m, char *cb)
-        {
-        union void_fn_to_char_u mem_callback;
-
-        mem_callback.char_p=cb;
-        mem_callback.fn_p(m->order,m->file,m->line,m->num,m->addr);
-        }
-
-void CRYPTO_mem_leaks_cb(void (*cb)())
-        {
-        union void_fn_to_char_u mem_cb;
-
-        if (mh == NULL) return;
-        CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2);
-        mem_cb.fn_p=cb;
-        lh_doall_arg(mh,(void (*)())cb_leak,mem_cb.char_p);
-        mem_cb.char_p=NULL;
-        CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2);
-        }
-
 #ifndef NO_FP_API
 void CRYPTO_mem_leaks_fp(FILE *fp)
         {
@@ -736,3 +710,21 @@ void CRYPTO_mem_leaks_fp(FILE *fp)
         }
 #endif
 
+
+
+/* FIXME: We really don't allow much to the callback.  For example, it has
+   no chance of reaching the info stack for the item it processes.  Should
+   it really be this way?  -- Richard Levitte */
+static void cb_leak(MEM *m,
+                    void (**cb)(unsigned long, const char *, int, int, void *))
+        {
+        (**cb)(m->order,m->file,m->line,m->num,m->addr);
+        }
+
+void CRYPTO_mem_leaks_cb(void (*cb)(unsigned long, const char *, int, int, void *))
+        {
+        if (mh == NULL) return;
+        CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2);
+        lh_doall_arg(mh,(void (*)())cb_leak,(void *)&cb);
+        CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2);
+        }