diff options
| author | Matt Caswell <matt@openssl.org> | 2022-08-09 12:59:22 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-08-17 12:57:48 +0200 |
| commit | f868454257560c78570549f6a34d5918f03898a0 (patch) | |
| tree | 8763e1e49c597c6e9c4b2b6404bf82ee2d360e2c | |
| parent | Correct the documentation for OPENSSL_MALLOC_FD (diff) | |
| download | openssl-f868454257560c78570549f6a34d5918f03898a0.tar.xz openssl-f868454257560c78570549f6a34d5918f03898a0.zip | |
CRYPTO_mem_debug_push() and CRYPTO_mem_debug_pop() should return 0
Those 2 functions historically only ever returned 0 or 1. In OpenSSL 3.0
they were made no-ops and the documentation says they always return 0. In
fact they were returning -1. If any application was actually using these
functions then it may appear that they were actually successful (e.g. -1
could be interpreted as "true").
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18967)
| -rw-r--r-- | crypto/mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index e57ff945a8..3d67d9256a 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -285,12 +285,12 @@ int CRYPTO_set_mem_debug(int flag) int CRYPTO_mem_debug_push(const char *info, const char *file, int line) { (void)info; (void)file; (void)line; - return -1; + return 0; } int CRYPTO_mem_debug_pop(void) { - return -1; + return 0; } void CRYPTO_mem_debug_malloc(void *addr, size_t num, int flag, |