From e0157cbf724d6bd07e4df512fc537028cd682968 Mon Sep 17 00:00:00 2001 From: Denisi Murataj Date: Mon, 23 May 2022 16:43:55 +0100 Subject: [PATCH] containers: fix undefined behaviour when flatVector2D is empty but has items --- src/containers/flatVector2D.tpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/containers/flatVector2D.tpp b/src/containers/flatVector2D.tpp index 3e28c9b13f..34f5a97e59 100644 --- a/src/containers/flatVector2D.tpp +++ b/src/containers/flatVector2D.tpp @@ -1091,6 +1091,10 @@ const T* FlatVector2D::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::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]; }