Merge cherrypicks of [16009370, 16012241, 16012242, 16012310, 16012367, 16012311, 16012312, 16012313, 16012216, 16012387, 16012388, 16012390, 16012335, 16012391] into security-aosp-qt-release
Change-Id: I51990723cd5bf33203870fe72f3ef91c779921ca
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);
