From 00da0ef87d9b58199e2b0b1803d2a1bea048fca0 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Sat, 17 May 2025 09:07:33 +0200
Subject: [PATCH] Add CAPACITYCHECK to static_vector

---
 include/opp/static_vector.h | 19 +++++++++++++++++++
 include/opp/vector.h        |  9 ++++++---
 include/oscar.c             |  7 +++++++
 include/oscar.h             |  2 ++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/include/opp/static_vector.h b/include/opp/static_vector.h
index 00cb1d2..dc5c617 100644
--- a/include/opp/static_vector.h
+++ b/include/opp/static_vector.h
@@ -4,6 +4,7 @@
 #include <new>
 #include <stdlib.h>
 #include <opp/utility.h>
+#include <oscar.h>
 
 namespace opp {
 
@@ -20,6 +21,9 @@ public:
 
 	static_vector(size_t n) : _size(n) 
 	{
+#ifdef CAPACITYCHECK
+	if (n > N) debugcrash();
+#endif
 		T *	data = (T*)_space;
 		for(size_t i=0; i<n; i++)
 			new (data + i) T();
@@ -202,6 +206,9 @@ void static_vector<T, N>::clear(void)
 template <class T, int N>
 void static_vector<T, N>::resize(size_t n)
 {
+#ifdef CAPACITYCHECK
+	if (n > N) debugcrash();
+#endif
 	T *	data = (T*)_space;
 	if (n < _size)
 	{
@@ -219,12 +226,18 @@ void static_vector<T, N>::resize(size_t n)
 template <class T, int N>
 void static_vector<T, N>::push_back(const T & t)
 {
+#ifdef CAPACITYCHECK
+	if (_size >= N) debugcrash();
+#endif
 	new ((T*)_space + _size++)T(t);
 }
 
 template <class T, int N>
 void static_vector<T, N>::push_back(T && t)
 {
+#ifdef CAPACITYCHECK
+	if (_size >= N) debugcrash();
+#endif
 	new ((T*)_space + _size++)T(t);
 }
 
@@ -232,6 +245,9 @@ template <class T, int N>
 template <typename ...P>
 void static_vector<T, N>::emplace_back(const P&... p)
 {
+#ifdef CAPACITYCHECK
+	if (_size >= N) debugcrash();
+#endif
 	new ((T*)_space + _size++)T(p...);
 }
 
@@ -271,6 +287,9 @@ void static_vector<T, N>::erase(size_t at, size_t n)
 template <class T, int N>
 T * static_vector<T, N>::insert(T * at, const T & t)
 {
+#ifdef CAPACITYCHECK
+	if (_size >= N) debugcrash();
+#endif
 	T *	data = (T*)_space;
 	T * dp = data + _size;
 	new (dp)T();
diff --git a/include/opp/vector.h b/include/opp/vector.h
index b8dc1bb..1238b9b 100644
--- a/include/opp/vector.h
+++ b/include/opp/vector.h
@@ -27,7 +27,8 @@ public:
 	vector(const vector & v)
 		: _data((T*)malloc(v._size * sizeof(T))), _size(v._size), _capacity(v._size) 
 	{
-		for(size_t i=0; i<_size; i++)
+		size_t n = _size;
+		for(size_t i=0; i<n; i++)
 			new (_data + i)T(v._data[i]);
 	}
 
@@ -50,14 +51,16 @@ public:
 	{
 		if (this != &v)
 		{
-			for(size_t i=0; i<_size; i++)
+			size_t n = _size;
+			for(size_t i=0; i<n; i++)
 				_data[i].~T();
 			free(_data);
 
 			_data = (T*)malloc(v._size * sizeof(T));
 			_size = v._size; 
 			_capacity = v._size; 
-			for(size_t i=0; i<_size; i++)
+			n = _size;
+			for(size_t i=0; i<n; i++)
 				new (_data + i)T(v._data[i]);		
 		}
 		return *this;
diff --git a/include/oscar.c b/include/oscar.c
index d2384b6..939328c 100644
--- a/include/oscar.c
+++ b/include/oscar.c
@@ -129,3 +129,10 @@ __native const char * oscar_expand_lzo_buf(char * dp, const char * sp)
 
 	return sp + 1;
 }
+
+void debugcrash(void)
+{
+	__asm volatile {
+		byt $02
+	}
+}
diff --git a/include/oscar.h b/include/oscar.h
index 2c988f0..ca1b03a 100644
--- a/include/oscar.h
+++ b/include/oscar.h
@@ -18,6 +18,8 @@ void breakpoint(void);
 
 #pragma intrinsic(breakpoint)
 
+void debugcrash(void);
+
 #pragma compile("oscar.c")
 
 #endif