Commit 8dc2e334 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Rich Salz
Browse files

Fix a possible crash in the error handling. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3672)

(cherry picked from commit 4fc426b7)
parent 55abd566

crypto/err/err.c

+12 −0
Original line number Diff line number Diff line
@@ -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) {