containers: fix undefined behaviour when flatVector2D is empty but has items

DMurataj01 · andrea-iob · commit e0157cbf724d · 2022-05-24T16:30:41.000+02:00
diff --git a/src/containers/flatVector2D.tpp b/src/containers/flatVector2D.tpp
@@ -1091,6 +1091,10 @@ const T* FlatVector2D<T>::operator[](std::size_t i) const
 {
     assert(isIndexValid(i));
 
+    if (m_v.empty()) {
+        return nullptr;
+    }
+
     std::size_t index = m_index[i];
     return &m_v[index];
 }
@@ -1106,6 +1110,10 @@ T* FlatVector2D<T>::operator[](std::size_t i)
 {
     assert(isIndexValid(i));
 
+    if (m_v.empty()) {
+        return nullptr;
+    }
+
     std::size_t index = m_index[i];
     return &m_v[index];
 }

Original file line number	Diff line number	Diff line change
`@@ -1091,6 +1091,10 @@ const T* FlatVector2D<T>::operator[](std::size_t i) const`
`1091`	`1091`	`{`
`1092`	`1092`	`assert(isIndexValid(i));`
`1093`	`1093`
	`1094`	`+ if (m_v.empty()) {`
	`1095`	`+ return nullptr;`
	`1096`	`+ }`
	`1097`	`+`
`1094`	`1098`	`std::size_t index = m_index[i];`
`1095`	`1099`	`return &m_v[index];`
`1096`	`1100`	`}`
`@@ -1106,6 +1110,10 @@ T* FlatVector2D<T>::operator[](std::size_t i)`
`1106`	`1110`	`{`
`1107`	`1111`	`assert(isIndexValid(i));`
`1108`	`1112`
	`1113`	`+ if (m_v.empty()) {`
	`1114`	`+ return nullptr;`
	`1115`	`+ }`
	`1116`	`+`
`1109`	`1117`	`std::size_t index = m_index[i];`
`1110`	`1118`	`return &m_v[index];`
`1111`	`1119`	`}`