Merge in recent changes from OpenSSL-0_9_6-stable

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 92b7891c2693f7143fede9c837da67ee363ff5a8..a7778ea7641d30ed6462378c6668ff75057a7bae 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -466,10 +466,9 @@ static unsigned long get_error_values(int inc, const char **file, int *line,
 
        if (data == NULL)
                {
-               if (inc && (es->err_data[i] != NULL) && (es->err_data_flags[i] & ERR_TXT_MALLOCED))
+               if (inc)
                        {
-                       OPENSSL_free(es->err_data[i]);
-                       es->err_data[i] = NULL;
+                       err_clear_data(es, i);
                        }
                }
        else