From: Bernd Edlinger Date: Tue, 13 Jun 2017 17:00:35 +0000 (+0200) Subject: Fix a possible crash in the error handling. X-Git-Tag: OpenSSL_1_0_2m~75 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8dc2e33468b1ee80ccf617bba760c84be65dcefb;p=oweals%2Fopenssl.git Fix a possible crash in the error handling. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3672) (cherry picked from commit 4fc426b78964b3d234cb7b1b6112c9b80e16a13a) --- diff --git a/crypto/err/err.c b/crypto/err/err.c index 0b1fcfc1f1..32fe8f320e 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -725,6 +725,8 @@ void ERR_put_error(int lib, int func, int reason, const char *file, int line) } #endif es = ERR_get_state(); + if (es == NULL) + return; es->top = (es->top + 1) % ERR_NUM_ERRORS; if (es->top == es->bottom) @@ -742,6 +744,8 @@ void ERR_clear_error(void) ERR_STATE *es; es = ERR_get_state(); + if (es == NULL) + return; for (i = 0; i < ERR_NUM_ERRORS; i++) { err_clear(es, i); @@ -806,6 +810,8 @@ static unsigned long get_error_values(int inc, int top, const char **file, unsigned long ret; es = ERR_get_state(); + if (es == NULL) + return 0; if (inc && top) { if (file) @@ -1066,6 +1072,8 @@ void ERR_set_error_data(char *data, int flags) int i; es = ERR_get_state(); + if (es == NULL) + return; i = es->top; if (i == 0) @@ -1121,6 +1129,8 @@ int ERR_set_mark(void) ERR_STATE *es; es = ERR_get_state(); + if (es == NULL) + return 0; if (es->bottom == es->top) return 0; @@ -1133,6 +1143,8 @@ int ERR_pop_to_mark(void) ERR_STATE *es; es = ERR_get_state(); + if (es == NULL) + return 0; while (es->bottom != es->top && (es->err_flags[es->top] & ERR_FLAG_MARK) == 0) {