GetAttachment: Added attachment index bounds check

rehlds · Jul 3, 2023 · 8841ba4 · 8841ba4
1 parent 0c5ce53
commit 8841ba4
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/rehlds/engine/r_studio.cpp b/rehlds/engine/r_studio.cpp
@@ -906,14 +906,23 @@ void EXT_FUNC GetAttachment(const edict_t *pEdict, int iAttachment, float *rgflO
 	mstudioattachment_t *pattachment;
 	vec3_t angles;
 
-	angles[0] = -pEdict->v.angles[0];
-	angles[1] = pEdict->v.angles[1];
-	angles[2] = pEdict->v.angles[2];
-
 	pstudiohdr = (studiohdr_t *)Mod_Extradata(g_psv.models[pEdict->v.modelindex]);
+
+#ifdef REHLDS_FIXES
+	if (!pstudiohdr)
+		return;
+
+	if (iAttachment < 0 || iAttachment >= pstudiohdr->numattachments)
+		return; // invalid attachment
+#endif
+
 	pattachment = (mstudioattachment_t *)((char *)pstudiohdr + pstudiohdr->attachmentindex);
 	pattachment += iAttachment;
 
+	angles[0] = -pEdict->v.angles[0];
+	angles[1] = pEdict->v.angles[1];
+	angles[2] = pEdict->v.angles[2];
+
 	g_pSvBlendingAPI->SV_StudioSetupBones(
 		g_psv.models[pEdict->v.modelindex],
 		pEdict->v.frame,