mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-23 14:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a possible crash in the error handling.

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3672)
This commit is contained in:
Bernd Edlinger 2017-06-13 19:00:35 +02:00 committed by Rich Salz
parent 4d0eac1999
commit 4fc426b789
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/err/err.c
View File

@ -378,6 +378,8 @@ void ERR_put_error(int lib, int func, int reason, const char *file, int line)
} }
#endif #endif
es = ERR_get_state(); es = ERR_get_state();
if (es == NULL)
return;
es->top = (es->top + 1) % ERR_NUM_ERRORS; es->top = (es->top + 1) % ERR_NUM_ERRORS;
if (es->top == es->bottom) if (es->top == es->bottom)
@ -395,6 +397,8 @@ void ERR_clear_error(void)
ERR_STATE *es; ERR_STATE *es;
es = ERR_get_state(); es = ERR_get_state();
if (es == NULL)
return;
for (i = 0; i < ERR_NUM_ERRORS; i++) { for (i = 0; i < ERR_NUM_ERRORS; i++) {
err_clear(es, i); err_clear(es, i);
@ -459,6 +463,8 @@ static unsigned long get_error_values(int inc, int top, const char **file,
unsigned long ret; unsigned long ret;
es = ERR_get_state(); es = ERR_get_state();
if (es == NULL)
return 0;
if (inc && top) { if (inc && top) {
if (file) if (file)
@ -709,6 +715,8 @@ void ERR_set_error_data(char *data, int flags)
int i; int i;
es = ERR_get_state(); es = ERR_get_state();
if (es == NULL)
return;
i = es->top; i = es->top;
if (i == 0) if (i == 0)
@ -764,6 +772,8 @@ int ERR_set_mark(void)
ERR_STATE *es; ERR_STATE *es;
es = ERR_get_state(); es = ERR_get_state();
if (es == NULL)
return 0;
if (es->bottom == es->top) if (es->bottom == es->top)
return 0; return 0;
@ -776,6 +786,8 @@ int ERR_pop_to_mark(void)
ERR_STATE *es; ERR_STATE *es;
es = ERR_get_state(); es = ERR_get_state();
if (es == NULL)
return 0;
while (es->bottom != es->top while (es->bottom != es->top
&& (es->err_flags[es->top] & ERR_FLAG_MARK) == 0) { && (es->err_flags[es->top] & ERR_FLAG_MARK) == 0) {