Merge in recent changes from OpenSSL-0_9_6-stable

This commit is contained in:
Richard Levitte
2001-03-13 12:28:00 +00:00
parent 1e6c9fc26f
commit bbc89d2e1f

View File

@@ -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