From aa37c1aa749a2791b4d0ad33a71d83a37f123e87 Mon Sep 17 00:00:00 2001
From: Vincent Davis Jr <vince@underview.tech>
Date: Sun, 6 Aug 2023 00:29:06 -0400
Subject: [PATCH] fix array subscript is outside array bounds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

warning: array subscript # is outside array bounds
of ‘float[#]’ [-Warray-bounds]

Commit also fixes variable order when calculating
multiplication between two matrices.

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
---
 include/cglm/mat2x3.h | 14 +++++++-------
 include/cglm/mat2x4.h | 17 ++++++++---------
 include/cglm/mat3x2.h | 12 ++++++------
 include/cglm/mat4x2.h | 16 ++++++++--------
 include/cglm/mat4x3.h |  4 ++++
 5 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/include/cglm/mat2x3.h b/include/cglm/mat2x3.h
index aab0dc1..e7ca209 100644
--- a/include/cglm/mat2x3.h
+++ b/include/cglm/mat2x3.h
@@ -94,18 +94,18 @@ glm_mat2x3_make(float * __restrict src, mat2x3 dest) {
 CGLM_INLINE
 void
 glm_mat2x3_mul(mat2x3 m1, mat3x2 m2, mat2 dest) {
-  float a00 = m1[0][0], a01 = m1[0][1],
-        a10 = m1[1][0], a11 = m1[1][1],
-        a20 = m1[2][0], a21 = m1[2][1],
+  float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2],
+        a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2],
 
         b00 = m2[0][0], b01 = m2[0][1],
         b10 = m2[1][0], b11 = m2[1][1],
         b20 = m2[2][0], b21 = m2[2][1];
 
-  dest[0][0] = a00 * b00 + a10 * b01 + a20 * b20;
-  dest[0][1] = a00 * b10 + a10 * b11 + a20 * b21;
-  dest[1][0] = a01 * b00 + a11 * b01 + a21 * b20;
-  dest[1][1] = a01 * b10 + a11 * b11 + a21 * b21;
+  dest[0][0] = a00 * b00 + a01 * b10 + a02 * b20;
+  dest[0][1] = a00 * b01 + a01 * b11 + a02 * b21;
+
+  dest[1][0] = a10 * b00 + a11 * b10 + a12 * b20;
+  dest[1][1] = a10 * b01 + a11 * b11 + a12 * b21;
 }
 
 /*!
diff --git a/include/cglm/mat2x4.h b/include/cglm/mat2x4.h
index 42f6673..28156cd 100644
--- a/include/cglm/mat2x4.h
+++ b/include/cglm/mat2x4.h
@@ -92,20 +92,19 @@ glm_mat2x4_make(float * __restrict src, mat2x4 dest) {
 CGLM_INLINE
 void
 glm_mat2x4_mul(mat2x4 m1, mat4x2 m2, mat2 dest) {
-  float a00 = m1[0][0], a01 = m1[0][1],
-        a10 = m1[1][0], a11 = m1[1][1],
-        a20 = m1[2][0], a21 = m1[2][1],
-        a30 = m1[3][0], a31 = m1[3][1],
+  float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], a03 = m1[0][3],
+        a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], a13 = m1[1][3],
 
         b00 = m2[0][0], b01 = m2[0][1],
         b10 = m2[1][0], b11 = m2[1][1],
         b20 = m2[2][0], b21 = m2[2][1],
         b30 = m2[3][0], b31 = m2[3][1];
 
-  dest[0][0] = a00 * b00 + a10 * b01 + a20 * b20 + a30 * b30;
-  dest[0][1] = a00 * b10 + a10 * b11 + a20 * b21 + a30 * b31;
-  dest[1][0] = a01 * b00 + a11 * b01 + a21 * b20 + a31 * b30;
-  dest[1][1] = a01 * b10 + a11 * b11 + a21 * b21 + a31 * b31;
+  dest[0][0] = a00 * b00 + a01 * b10 + a02 * b20 + a03 * b30;
+  dest[0][1] = a00 * b01 + a01 * b11 + a02 * b21 + a03 * b31;
+
+  dest[1][0] = a10 * b00 + a11 * b10 + a12 * b20 + a13 * b30;
+  dest[1][1] = a10 * b01 + a11 * b11 + a12 * b21 + a13 * b31;
 }
 
 /*!
@@ -151,7 +150,7 @@ CGLM_INLINE
 void
 glm_mat2x4_scale(mat2x4 m, float s) {
   m[0][0] *= s;  m[0][1] *= s;  m[0][2] *= s;  m[0][3] *= s;
-  m[1][0] *= s;  m[1][1] *= s;  m[2][2] *= s;  m[3][3] *= s;
+  m[1][0] *= s;  m[1][1] *= s;  m[1][2] *= s;  m[1][3] *= s;
 }
 
 #endif
diff --git a/include/cglm/mat3x2.h b/include/cglm/mat3x2.h
index f3801ed..f7c8a72 100644
--- a/include/cglm/mat3x2.h
+++ b/include/cglm/mat3x2.h
@@ -103,13 +103,13 @@ glm_mat3x2_mul(mat3x2 m1, mat2x3 m2, mat3 dest) {
         b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2],
         b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2];
 
-  dest[0][0] = a00 * b00 + a10 * b10;
-  dest[0][1] = a00 * b01 + a10 * b11;
-  dest[0][2] = a00 * b02 + a10 * b12;
+  dest[0][0] = a00 * b00 + a01 * b10;
+  dest[0][1] = a00 * b01 + a01 * b11;
+  dest[0][2] = a00 * b02 + a01 * b12;
 
-  dest[1][0] = a01 * b00 + a11 * b10;
-  dest[1][1] = a01 * b01 + a11 * b11;
-  dest[1][2] = a01 * b02 + a11 * b12;
+  dest[1][0] = a10 * b00 + a11 * b10;
+  dest[1][1] = a10 * b01 + a11 * b11;
+  dest[1][2] = a10 * b02 + a11 * b12;
 
   dest[2][0] = a20 * b00 + a21 * b10;
   dest[2][1] = a20 * b01 + a21 * b11;
diff --git a/include/cglm/mat4x2.h b/include/cglm/mat4x2.h
index 183b38a..4c647a2 100644
--- a/include/cglm/mat4x2.h
+++ b/include/cglm/mat4x2.h
@@ -110,15 +110,15 @@ glm_mat4x2_mul(mat4x2 m1, mat2x4 m2, mat4 dest) {
         b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], b03 = m2[0][3],
         b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], b13 = m2[1][3];
 
-  dest[0][0] = a00 * b00 + a10 * b10;
-  dest[0][1] = a00 * b01 + a10 * b11;
-  dest[0][2] = a00 * b02 + a10 * b12;
-  dest[0][3] = a00 * b03 + a10 * b13;
+  dest[0][0] = a00 * b00 + a01 * b10;
+  dest[0][1] = a00 * b01 + a01 * b11;
+  dest[0][2] = a00 * b02 + a01 * b12;
+  dest[0][3] = a00 * b03 + a01 * b13;
 
-  dest[1][0] = a01 * b00 + a11 * b10;
-  dest[1][1] = a01 * b01 + a11 * b11;
-  dest[1][2] = a01 * b02 + a11 * b12;
-  dest[1][3] = a01 * b03 + a11 * b13;
+  dest[1][0] = a10 * b00 + a11 * b10;
+  dest[1][1] = a10 * b01 + a11 * b11;
+  dest[1][2] = a10 * b02 + a11 * b12;
+  dest[1][3] = a10 * b03 + a11 * b13;
 
   dest[2][0] = a20 * b00 + a21 * b10;
   dest[2][1] = a20 * b01 + a21 * b11;
diff --git a/include/cglm/mat4x3.h b/include/cglm/mat4x3.h
index de96d84..1066dfc 100644
--- a/include/cglm/mat4x3.h
+++ b/include/cglm/mat4x3.h
@@ -42,15 +42,19 @@ void
 glm_mat4x3_copy(mat4x3 mat, mat4x3 dest) {
   dest[0][0] = mat[0][0];
   dest[0][1] = mat[0][1];
+  dest[0][2] = mat[0][2];
 
   dest[1][0] = mat[1][0];
   dest[1][1] = mat[1][1];
+  dest[1][2] = mat[1][2];
 
   dest[2][0] = mat[2][0];
   dest[2][1] = mat[2][1];
+  dest[2][2] = mat[2][2];
 
   dest[3][0] = mat[3][0];
   dest[3][1] = mat[3][1];
+  dest[3][2] = mat[3][2];
 }
 
 /*!