Added safe item indexer

Author: Ayuto

src/core/modules/mathlib/mathlib_wrap_python.cpp

@@ -97,11 +97,11 @@ void export_vector()
 		)
 
 		.def("__getitem__",
-			static_cast< float(Vector::*)( int ) const >(&Vector::operator[])
+			&GetItemIndexer<Vector, float, 0, 2>
 		)
 
 		.def("__setitem__",
-			&SetItemIndexer<Vector, float>
+			&SetItemIndexer<Vector, float, 0, 2>
 		)
 
 		.def("as_vector_2D",
@@ -270,11 +270,11 @@ void export_qangle()
 		)
 
 		.def("__getitem__",
-			static_cast< float(QAngle::*)( int ) const >(&QAngle::operator[])
+			&GetItemIndexer<QAngle, float, 0, 2>
 		)
 
 		.def("__setitem__",
-			SetItemIndexer<QAngle, float>
+			&SetItemIndexer<QAngle, float, 0, 2>
 		)
 
 		.def(self == self)
@@ -326,11 +326,11 @@ void export_quaternion()
 		.def(self != self)
 
 		.def("__getitem__",
-			static_cast< float(Quaternion::*)( int ) const >(&Quaternion::operator[])
+			&GetItemIndexer<Quaternion, float, 0, 3>
 		)
 
 		.def("__setitem__",
-			&SetItemIndexer<Quaternion, float>
+			&SetItemIndexer<Quaternion, float, 0, 3>
 		)
 
 		.def_readwrite("x",
@@ -406,11 +406,11 @@ void export_radian_euler()
 		)
 
 		.def("__getitem__",
-			static_cast< float(RadianEuler::*)( int ) const >(&RadianEuler::operator[])
+			&GetItemIndexer<RadianEuler, float, 0, 2>
 		)
 
 		.def("__setitem__",
-			&SetItemIndexer<RadianEuler, float>
+			&SetItemIndexer<RadianEuler, float, 0, 2>
 		)
 
 		.def_readwrite("x",

src/core/modules/usermessage/usermessage_wrap_python.cpp

@@ -197,27 +197,14 @@ void export_color()
 		.def(init<int, int, int>())
 		.def(init<int, int, int, int>())
 
-		.def("set_color",
-			&Color::SetColor,
-			set_color_overload(
-				"Sets the color in a RGB(A) format (0-255).",
-				args("r", "g", "b", "a")
-			)
-		)
-
-		.def("get_color",
-			&ColorExt::GetColor,
-			"Returns the color as a tuple containing the RGBA values."
-		)
-
 		.def("__getitem__",
-			&GetItemIndexer<Color, unsigned char>,
-			"Returns the color at the given index (0-3)."
+			&GetItemIndexer<Color, unsigned char, 0, 3>,
+			"Returns the color at the given index."
 		)
 
 		.def("__setitem__",
-			&SetItemIndexer<Color, unsigned char>,
-			"Sets the color at the given index (0-3)."
+			&SetItemIndexer<Color, unsigned char, 0, 3>,
+			"Sets the color at the given index."
 		)
 
 		.def(self == self)

src/core/utility/sp_util.h

@@ -64,12 +64,30 @@ inline unsigned long ExtractPyPtr(object obj)
 //---------------------------------------------------------------------------------
 // Helper template methods for __getitem__ and __setitem__
 //---------------------------------------------------------------------------------
+template<class cls, class return_type, int iMin, int iMax>
+return_type GetItemIndexer(cls* self, int iIndex)
+{
+	if ((iIndex < iMin) || (iIndex > iMax))
+		BOOST_RAISE_EXCEPTION(PyExc_IndexError, "Index out of range.");
+		
+	return (*self)[iIndex];
+}
+
 template<class T, class U>
 U GetItemIndexer(const T* self, const int i)
 {
 	return (*self)[i];
 }
 
+template<class cls, class value_type, int iMin, int iMax>
+void SetItemIndexer(cls* self, int iIndex, value_type value)
+{
+	if ((iIndex < iMin) || (iIndex > iMax))
+		BOOST_RAISE_EXCEPTION(PyExc_IndexError, "Index out of range.");
+		
+	(*self)[iIndex] = value;
+}
+
 template<class T, class U>
 void SetItemIndexer(T* self, const int i, const U& value)
 {