From: Matt Caswell <matt@openssl.org>
Date: Tue, 9 Aug 2022 10:59:22 +0000 (+0100)
Subject: CRYPTO_mem_debug_push() and CRYPTO_mem_debug_pop() should return 0
X-Git-Tag: openssl-3.2.0-alpha1~2279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f868454257560c78570549f6a34d5918f03898a0;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/crypto/mem.c b/crypto/mem.c
index e57ff945a80..3d67d9256a6 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,