From 31c4b6adf0fc65beb85d28fc58b39907efc0fa81 Mon Sep 17 00:00:00 2001
From: "Chris (ChrisJr404)" <11917633+ChrisJr404@users.noreply.github.com>
Date: Tue, 18 Aug 2026 08:49:04 -0400
Subject: [PATCH] loader/obj: guard against out-of-range face indices

A face line whose vertex/uv/normal index points past the decoded arrays
(e.g. "f 1 2 999999", or a large negative index) caused NewGeometry to
panic with an index-out-of-range while copying vertices, since the indices
read straight from the OBJ were passed to ArrayF32.GetVector3/GetVector2
without any bounds check. A malformed or malicious .obj is enough to crash
a program that loads it.

Validate each index against the corresponding array length before use and
return an error instead of panicking. The bounds are checked with the
element count (len/stride) rather than stride*index so the check itself
cannot overflow. Adds tests covering the out-of-range cases and a valid
file.
---
 loader/obj/obj.go      | 39 +++++++++++++++++++++++++++++++--------
 loader/obj/obj_test.go | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 loader/obj/obj_test.go

diff --git a/loader/obj/obj.go b/loader/obj/obj.go
index febc9b41..3e9e82d7 100644
--- a/loader/obj/obj.go
+++ b/loader/obj/obj.go
@@ -321,26 +321,43 @@ func (dec *Decoder) NewGeometry(obj *Object) (*geometry.Geometry, error) {
 	uvs := math32.NewArrayF32(0, 0)
 	indices := math32.NewArrayU32(0, 0)
 
-	// copy all vertex info from the decoded Object, face and index to the geometry
-	copyVertex := func(face *Face, idx int) {
+	// copy all vertex info from the decoded Object, face and index to the geometry.
+	// Face indices come from the (potentially untrusted) OBJ file, so they are
+	// validated against the decoded arrays to avoid an out-of-range panic. The
+	// bounds are expressed using the element count (len/stride) rather than
+	// stride*index so the check cannot itself overflow on 32-bit platforms.
+	copyVertex := func(face *Face, idx int) error {
 		var vec3 math32.Vector3
 		var vec2 math32.Vector2
 
 		pos := positions.Size() / 3
 		// Copy vertex position and append to geometry
-		dec.Vertices.GetVector3(3*face.Vertices[idx], &vec3)
+		vi := face.Vertices[idx]
+		if vi < 0 || vi >= len(dec.Vertices)/3 {
+			return fmt.Errorf("obj: face vertex index %d out of range (have %d vertices)", vi, len(dec.Vertices)/3)
+		}
+		dec.Vertices.GetVector3(3*vi, &vec3)
 		positions.AppendVector3(&vec3)
 		// Copy vertex normal and append to geometry
 		if face.Normals[idx] != invINDEX {
-			dec.Normals.GetVector3(3*face.Normals[idx], &vec3)
+			ni := face.Normals[idx]
+			if ni < 0 || ni >= len(dec.Normals)/3 {
+				return fmt.Errorf("obj: face normal index %d out of range (have %d normals)", ni, len(dec.Normals)/3)
+			}
+			dec.Normals.GetVector3(3*ni, &vec3)
 			normals.AppendVector3(&vec3)
 		}
 		// Copy vertex uv and append to geometry
 		if face.Uvs[idx] != invINDEX {
-			dec.Uvs.GetVector2(2*face.Uvs[idx], &vec2)
+			ui := face.Uvs[idx]
+			if ui < 0 || ui >= len(dec.Uvs)/2 {
+				return fmt.Errorf("obj: face uv index %d out of range (have %d uvs)", ui, len(dec.Uvs)/2)
+			}
+			dec.Uvs.GetVector2(2*ui, &vec2)
 			uvs.AppendVector2(&vec2)
 		}
 		indices.Append(uint32(pos))
+		return nil
 	}
 
 	var group *geometry.Group
@@ -355,9 +372,15 @@ func (dec *Decoder) NewGeometry(obj *Object) (*geometry.Geometry, error) {
 		}
 		// Copy face vertices to geometry
 		for idx := 1; idx < len(face.Vertices)-1; idx++ {
-			copyVertex(&face, 0)
-			copyVertex(&face, idx)
-			copyVertex(&face, idx+1)
+			if err := copyVertex(&face, 0); err != nil {
+				return nil, err
+			}
+			if err := copyVertex(&face, idx); err != nil {
+				return nil, err
+			}
+			if err := copyVertex(&face, idx+1); err != nil {
+				return nil, err
+			}
 			group.Count += 3
 		}
 	}
diff --git a/loader/obj/obj_test.go b/loader/obj/obj_test.go
new file mode 100644
index 00000000..24ee19ae
--- /dev/null
+++ b/loader/obj/obj_test.go
@@ -0,0 +1,40 @@
+package obj
+
+import (
+	"strings"
+	"testing"
+)
+
+// A face that references an out-of-range vertex/uv/normal index must not panic
+// when the decoded object is turned into geometry; it must return an error.
+func TestNewGeometryOutOfRangeIndex(t *testing.T) {
+	cases := map[string]string{
+		"vertex too large": "v 0 0 0\nv 1 0 0\nv 0 1 0\nf 1 2 999999\n",
+		"vertex negative":  "v 0 0 0\nv 1 0 0\nv 0 1 0\nf -100 -100 -100\n",
+		"uv too large":     "v 0 0 0\nv 1 0 0\nv 0 1 0\nvt 0 0\nf 1/1 2/1 3/9999\n",
+		"normal too large": "v 0 0 0\nv 1 0 0\nv 0 1 0\nvn 0 0 1\nf 1//1 2//1 3//9999\n",
+	}
+	for name, src := range cases {
+		t.Run(name, func(t *testing.T) {
+			dec, err := DecodeReader(strings.NewReader(src), nil)
+			if err != nil {
+				t.Fatalf("decode: %v", err)
+			}
+			if _, err := dec.NewGeometry(&dec.Objects[0]); err == nil {
+				t.Fatalf("expected out-of-range error, got nil")
+			}
+		})
+	}
+}
+
+// A well-formed OBJ must still build geometry without error.
+func TestNewGeometryValid(t *testing.T) {
+	src := "v 0 0 0\nv 1 0 0\nv 0 1 0\nvt 0 0\nvt 1 0\nvt 0 1\nvn 0 0 1\nf 1/1/1 2/2/1 3/3/1\n"
+	dec, err := DecodeReader(strings.NewReader(src), nil)
+	if err != nil {
+		t.Fatalf("decode: %v", err)
+	}
+	if _, err := dec.NewGeometry(&dec.Objects[0]); err != nil {
+		t.Fatalf("valid obj should not error: %v", err)
+	}
+}