From: Richard Levitte <levitte@openssl.org>
Date: Tue, 13 Mar 2001 12:28:00 +0000 (+0000)
Subject: Merge in recent changes from OpenSSL-0_9_6-stable
X-Git-Tag: OpenSSL-engine-0_9_6a-beta1~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bbc89d2e1fe285b4b9e79cc25964372a6a32b540;p=oweals%2Fopenssl.git

Merge in recent changes from OpenSSL-0_9_6-stable
---

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 92b7891c26..a7778ea764 100644
--- 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