commit 216db679a787e39e5a69a47a7440791d0da8b759
author David Benjamin <davidben@google.com> Thu Oct 05 10:42:15 2023 -0400
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 05 19:10:54 2023 +0000
tree b42979045714e1926dc7b2dd8e3f6bcd9f7eaea0
parent dd68e4bb4d63b74b0996b714d0bc8c7f51af334b

Also add OPENSSL_calloc

This is not in upstream OpenSSL but saves a bunch of manual overflow
checks. Note it does also introduce some zeroing of buffers, but I think
this should be fine here.

Change-Id: I0c3e65ce2d21ee9d206ccbe3075ce5291c3acb30
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/63365
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>

crypto/mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index b17267f..5609224 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -275,6 +275,15 @@
   return ret;
 }
 
+void *OPENSSL_calloc(size_t num, size_t size) {
+  if (size != 0 && num > SIZE_MAX / size) {
+    OPENSSL_PUT_ERROR(CRYPTO, ERR_R_OVERFLOW);
+    return NULL;
+  }
+
+  return OPENSSL_zalloc(num * size);
+}
+
 void OPENSSL_free(void *orig_ptr) {
   if (orig_ptr == NULL) {
     return;