Merge "osi: Prevent memory allocations with MSB set" (9e18f6a9) · Commits · e / os / android_packages_modules_Bluetooth

system/osi/src/allocator.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ char* osi_strndup(const char* str, size_t len) {
		}

		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);
		@@ -64,6 +65,7 @@ void* osi_malloc(size_t size) {
		}

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