util: Fix out of bounds access in matrix constructor.

SFTtech · Oct 9, 2023 · 52058a1 · 52058a1
1 parent 4002db5
commit 52058a1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libopenage/util/matrix.h b/libopenage/util/matrix.h
@@ -63,8 +63,12 @@ class Matrix : public std::array<std::array<T, N>, M> {
 		static_assert(sizeof...(args) == N * M, "not all values supplied");
 
 		std::array<float, N * M> temp{{static_cast<T>(args)...}};
-		for (size_t i = 0; i < N * M; i++) {
-			(*this)[i / (N * M)][i % (N * M)] = temp[i];
+		size_t index = 0;
+		for (size_t row = 0; row < M; row++) {
+			for (size_t col = 0; col < N; col++) {
+				(*this)[row][col] = temp[index];
+				index += 1;
+			}
 		}
 	}