X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=include%2FirrArray.h;h=f94cfb0250e1da746de4e84677a3c13fbb9df844;hb=d6716ec31b7399517655403d8963b7632bbbf6b3;hp=dbad8c872a33eb386c3069dee9da784b7d7a426d;hpb=3e81f3809806a921a7914f6b9c4b02c8532fbc9f;p=irrlicht.git

diff --git a/include/irrArray.h b/include/irrArray.h
index dbad8c8..f94cfb0 100644
--- a/include/irrArray.h
+++ b/include/irrArray.h
@@ -227,7 +227,7 @@ public:
 	/** \return Pointer to the array. */
 	T* pointer()
 	{
-		return &m_data[0];
+		return m_data.empty() ? nullptr : &m_data[0];
 	}
 
 
@@ -235,7 +235,7 @@ public:
 	/** \return Pointer to the array. */
 	const T* const_pointer() const
 	{
-		return &m_data[0];
+		return m_data.empty() ? nullptr : &m_data[0];
 	}
 
 
@@ -394,7 +394,7 @@ public:
 	{
 		if (index >= m_data.size() || count < 1)
 			return;
-		count = std::min(count, (s32)m_data.size() - (s32)index);
+		count = core::min_(count, (s32)m_data.size() - (s32)index);
 		auto first = std::next(m_data.begin(), index);
 		auto last = std::next(first, count);
 		m_data.erase(first, last);