diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2023-09-20 15:45:56 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2023-09-21 14:51:25 +0200 |
| commit | bf01afe9ad625e0ad92c40865192ba4a5a12f20e (patch) | |
| tree | e1d7dbe3d39f607b8b04ce635ffff54cc8e9c65a /crypto | |
| parent | 44cea98d9006b08941e24c18d6eedbd01c3775c7 (diff) | |
Fix error handling in lhash contract
When the realloc fails in contract, this not a fatal
error, since the memory is only shrinked. It is also no
option to exit the function at this point, since that
would leave the hash table in an inconsistent state.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22154)
(cherry picked from commit 5fbfd641aeebdf4b29a0749e13a79a1e59502878)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/lhash/lhash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index 1cd988f01f..bd39b1ba57 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -266,12 +266,12 @@ static void contract(OPENSSL_LHASH *lh) if (n == NULL) { /* fputs("realloc error in lhash",stderr); */ lh->error++; - return; + } else { + lh->b = n; } lh->num_alloc_nodes /= 2; lh->pmax /= 2; lh->p = lh->pmax - 1; - lh->b = n; } else lh->p--; |