Merge branch 'master' into xml

1 files changed, 6 insertions, 0 deletions

diff --git a/src/array.cpp b/src/array.cpp
index c41125c6d..d08bd647f 100644
--- a/src/array.cpp
+++ b/src/array.cpp
@@ -77,15 +77,21 @@ template <typename T> Slice<T> slice_from_array(Array<T> const &a);
 
 template <typename T>
 Slice<T> slice_make(gbAllocator const &allocator, isize count) {
+	GB_ASSERT(count >= 0);
 	Slice<T> s = {};
 	s.data = gb_alloc_array(allocator, T, count);
+	GB_ASSERT(s.data != nullptr);
 	s.count = count;
 	return s;
 }
 
 template <typename T>
 void slice_init(Slice<T> *s, gbAllocator const &allocator, isize count) {
+	GB_ASSERT(count >= 0);
 	s->data = gb_alloc_array(allocator, T, count);
+	if (count > 0) {
+		GB_ASSERT(s->data != nullptr);
+	}
 	s->count = count;
 }