X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fmem_dbg.c;h=ac793397f10f5289fe0d1a5ac1cc8ad3e33f4b28;hb=c58de759c8700de4fbf26eff0053a87f48db6fb2;hp=f80060d9471a0bf71d798e730951d2319821351c;hpb=4d6e1e4f29de455b5e644ea9cae5d5f5a2dbef33;p=oweals%2Fopenssl.git

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index f80060d947..ac793397f1 100644
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -478,7 +478,7 @@ int CRYPTO_remove_all_info(void)
 
 
 static unsigned long break_order_num=0;
-void CRYPTO_dbg_malloc(void *addr, size_t num, const char *file, int line,
+void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
 	int before_p)
 	{
 	MEM *m,*mm;
@@ -602,8 +602,8 @@ void CRYPTO_dbg_free(void *addr, int before_p)
 		}
 	}
 
-void CRYPTO_dbg_realloc(void *addr1, void *addr2, size_t num,
-			const char *file, int line, int before_p)
+void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
+	const char *file, int line, int before_p)
 	{
 	MEM m,*mp;
 
@@ -666,7 +666,7 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l)
 	char buf[1024];
 	char *bufp = buf;
 	APP_INFO *amip;
-	size_t ami_cnt;
+	int ami_cnt;
 	struct tm *lcl = NULL;
 	CRYPTO_THREADID ti;
 
@@ -712,7 +712,7 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l)
 
 	do
 		{
-		size_t buf_len;
+		int buf_len;
 		int info_len;
 
 		ami_cnt++;
@@ -772,6 +772,9 @@ void CRYPTO_mem_leaks(BIO *b)
 		{
 		BIO_printf(b,"%ld bytes leaked in %d chunks\n",
 			   ml.bytes,ml.chunks);
+#ifdef CRYPTO_MDEBUG_ABORT
+		abort();
+#endif
 		}
 	else
 		{
@@ -784,7 +787,7 @@ void CRYPTO_mem_leaks(BIO *b)
 		 * XXX    This should be in CRYPTO_mem_leaks_cb,
 		 * and CRYPTO_mem_leaks should be implemented by
 		 * using CRYPTO_mem_leaks_cb.
-		 * (Also their should be a variant of lh_doall_arg
+		 * (Also there should be a variant of lh_doall_arg
 		 * that takes a function pointer instead of a void *;
 		 * this would obviate the ugly and illegal
 		 * void_fn_to_char kludge in CRYPTO_mem_leaks_cb.