diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-06-14 10:16:15 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-06-14 11:53:11 +0100 |
| commit | 7ff7f5e9b826325c851869846ffb0ce58fdba15f (patch) | |
| tree | 909d7a0bed48462f99aecdd4d26bd47f016d95f1 /crypto/err | |
| parent | 8dc2e33468b1ee80ccf617bba760c84be65dcefb (diff) | |
Remove the fallback from ERR_get_state because the
return value is now checked at the callers.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3678)
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index 32fe8f320e..03d407cab8 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -1022,7 +1022,6 @@ void ERR_remove_state(unsigned long pid) ERR_STATE *ERR_get_state(void) { - static ERR_STATE fallback; ERR_STATE *ret, tmp, *tmpp = NULL; int i; CRYPTO_THREADID tid; @@ -1036,7 +1035,7 @@ ERR_STATE *ERR_get_state(void) if (ret == NULL) { ret = (ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE)); if (ret == NULL) - return (&fallback); + return NULL; CRYPTO_THREADID_cpy(&ret->tid, &tid); ret->top = 0; ret->bottom = 0; @@ -1048,7 +1047,7 @@ ERR_STATE *ERR_get_state(void) /* To check if insertion failed, do a get. */ if (ERRFN(thread_get_item) (ret) != ret) { ERR_STATE_free(ret); /* could not insert it */ - return (&fallback); + return NULL; } /* * If a race occured in this function and we came second, tmpp is the |