commit ce8965827468ef1cf7ab469fd52f803ac681577e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 12 01:28:42 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 12 01:28:42 2021 +0000
tree f56df5e34ec40e856adadd554479f7c0757ab64c
parent 95631999f855a7236aed71e38109796b22c5d9eb
parent 62b5e9962c00f6c16629fb9d24756578c9e2dcaf

Snap for 7814173 from 62b5e9962c00f6c16629fb9d24756578c9e2dcaf to mainline-wifi-release

Change-Id: Ibee1a7c914c5d2b42ad34ec338da07bfc26b6576

osi/src/allocator.cc

diff --git a/osi/src/allocator.cc b/osi/src/allocator.cc
index 1c0449e..e2c356d 100644
--- a/osi/src/allocator.cc
+++ b/osi/src/allocator.cc
@@ -56,6 +56,7 @@
 }
 
 void* osi_malloc(size_t size) {
+  CHECK(static_cast<ssize_t>(size) >= 0);
   size_t real_size = allocation_tracker_resize_for_canary(size);
   void* ptr = malloc(real_size);
   CHECK(ptr);
@@ -63,6 +64,7 @@
 }
 
 void* osi_calloc(size_t size) {
+  CHECK(static_cast<ssize_t>(size) >= 0);
   size_t real_size = allocation_tracker_resize_for_canary(size);
   void* ptr = calloc(1, real_size);
   CHECK(ptr);