Commit bbc89d2e authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in recent changes from OpenSSL-0_9_6-stable

parent 1e6c9fc2

crypto/err/err.c

+2 −3
Original line number Diff line number Diff line
@@ -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