nullprop/halflife-photomode
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix out of bounds access in studiomodel renderer bone setup code

Browse source 
ValveSoftware/halflife#3360
This commit is contained in:
Sam V 2023-08-12 19:02:14 +02:00
parent 9f5cd6106b
commit 68bb362ffb
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@
### Bug fixes
* Fixed hand grenade animations not playing correctly [#209](https://github.com/SamVanheer/halflife-updated/pull/209) (Thanks Toodles2You)
* Fixed out of bounds access in studiomodel renderer bone setup code (halflife issue [#3360](https://github.com/ValveSoftware/halflife/issues/3360))
## Changes in V1.0.0 Release Candidate 001

18
cl_dll/StudioModelRenderer.cpp
View file

@ -940,11 +940,15 @@ void CStudioModelRenderer::StudioSetupBones()
for (i = 0; i < m_pStudioHeader->numbones; i++)
{
if (0 == strcmp(pbones[i].name, "Bip01 Spine"))
auto bone = &pbones[i];
if (0 == strcmp(bone->name, "Bip01 Spine"))
{
copy = false;
}
else if (0 == strcmp(pbones[pbones[i].parent].name, "Bip01 Pelvis"))
else if (bone->parent >= 0 &&
bone->parent < m_pStudioHeader->numbones &&
0 == strcmp(pbones[bone->parent].name, "Bip01 Pelvis"))
{
copy = true;
}
@ -959,13 +963,15 @@ void CStudioModelRenderer::StudioSetupBones()
for (i = 0; i < m_pStudioHeader->numbones; i++)
{
const int parent = pbones[i].parent;
QuaternionMatrix(q[i], bonematrix);
bonematrix[0][3] = pos[i][0];
bonematrix[1][3] = pos[i][1];
bonematrix[2][3] = pos[i][2];
if (pbones[i].parent == -1)
if (parent == -1)
{
if (0 != IEngineStudio.IsHardware())
{
@ -984,10 +990,10 @@ void CStudioModelRenderer::StudioSetupBones()
// Apply client-side effects to the transformation matrix
StudioFxTransform(m_pCurrentEntity, (*m_pbonetransform)[i]);
}
else
else if (parent >= 0 && parent < m_pStudioHeader->numbones)
{
ConcatTransforms((*m_pbonetransform)[pbones[i].parent], bonematrix, (*m_pbonetransform)[i]);
ConcatTransforms((*m_plighttransform)[pbones[i].parent], bonematrix, (*m_plighttransform)[i]);
ConcatTransforms((*m_pbonetransform)[parent], bonematrix, (*m_pbonetransform)[i]);
ConcatTransforms((*m_plighttransform)[parent], bonematrix, (*m_plighttransform)[i]);
}
}
}