Change the printing mahine used by BIO_printf() and friends so it can

[oweals/openssl.git] / crypto / err / err.c

diff --git a/crypto/err/err.c b/crypto/err/err.c
index ad062a9022935881345c6f3308c47d6908782f63..bfecb86c754b65b23cfd8fe98337cdd68700217a 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -535,7 +535,7 @@ char *ERR_error_string(unsigned long e, char *ret)
        static char buf[256];
 
        if (ret == NULL) ret=buf;
-       ERR_error_string_n(e, buf, 256);
+       ERR_error_string_n(e, ret, 256);
 
        return(ret);
        }
@@ -644,7 +644,7 @@ static int pid_cmp(ERR_STATE *a, ERR_STATE *b)
 
 void ERR_remove_state(unsigned long pid)
        {
-       ERR_STATE *p,tmp;
+       ERR_STATE *p = NULL,tmp;
 
        if (thread_hash == NULL)
                return;
@@ -652,12 +652,15 @@ void ERR_remove_state(unsigned long pid)
                pid=(unsigned long)CRYPTO_thread_id();
        tmp.pid=pid;
        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-       p=(ERR_STATE *)lh_delete(thread_hash,&tmp);
-       if (lh_num_items(thread_hash) == 0)
+       if (thread_hash)
                {
-               /* make sure we don't leak memory */
-               lh_free(thread_hash);
-               thread_hash = NULL;
+               p=(ERR_STATE *)lh_delete(thread_hash,&tmp);
+               if (lh_num_items(thread_hash) == 0)
+                       {
+                       /* make sure we don't leak memory */
+                       lh_free(thread_hash);
+                       thread_hash = NULL;
+                       }
                }
        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);