From: Norbert Pocs <norbertp@openssl.org>
Date: Thu, 3 Jul 2025 13:58:52 +0000 (+0200)
Subject: crypto/mem.c optimize ossl_(un)likely
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296e4d3c95b43922affa1407350c03184d6b59f5;p=thirdparty%2Fopenssl.git

crypto/mem.c optimize ossl_(un)likely

Signed-off-by: Norbert Pocs <norbertp@openssl.org>

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27961)
---

diff --git a/crypto/mem.c b/crypto/mem.c
index c6cdfb36e1e..be5b040669d 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -195,7 +195,7 @@ void *CRYPTO_malloc(size_t num, const char *file, int line)
         goto err;
     }
 
-    if (num == 0)
+    if (ossl_unlikely(num == 0))
         return NULL;
 
     FAILTEST();
@@ -209,7 +209,7 @@ void *CRYPTO_malloc(size_t num, const char *file, int line)
     }
 
     ptr = malloc(num);
-    if (ptr != NULL)
+    if (ossl_likely(ptr != NULL))
         return ptr;
  err:
     /*