Skip to content

Fix: Add null checks for HTree and Pivot arrays before accessing them #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Add null checks for HTree and Pivot arrays before accessing them #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,11 @@ bool HTreeClass::Simple_Evaluate_Pivot
*=============================================================================================*/
void HTreeClass::Base_Update(const Matrix3D & root)
{
// Validate Pivot array exists and has at least one element
if (Pivot == NULL || NumPivots <= 0) {
return;
}

PivotClass *pivot;

Pivot[0].Transform = root;
Expand All @@ -538,6 +543,11 @@ void HTreeClass::Base_Update(const Matrix3D & root)

pivot = &Pivot[piv_idx];

// Validate parent pointer before accessing it
if (pivot->Parent == NULL) {
continue;
}

assert(pivot->Parent != NULL);
Matrix3D::Multiply(pivot->Parent->Transform, pivot->BaseTransform, &(pivot->Transform));
pivot->IsVisible = 1;
Expand Down
6 changes: 6 additions & 0 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,12 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
*/
CompositeRenderObjClass::Update_Sub_Object_Transforms();

// Validate HTree exists before accessing it
if (HTree == NULL) {
Set_Hierarchy_Valid(true);
return;
}

/*
** Update the transforms
*/
Expand Down
21 changes: 21 additions & 0 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3348,15 +3348,31 @@ void HLodClass::Update_Sub_Object_Transforms(void)
*/
Animatable3DObjClass::Update_Sub_Object_Transforms();

// Validate HTree exists before accessing it
if (HTree == NULL) {
Set_Sub_Object_Transforms_Dirty(false);
return;
}

/*
** Put the computed transforms into our sub objects.
*/
int lod,model;

for (lod = 0; lod < LodCount; lod++) {
// Validate LOD array exists
if (Lod == NULL) {
break;
}

for (model = 0; model < Lod[lod].Count(); model++) {

RenderObjClass * robj = Lod[lod][model].Model;
// Validate render object pointer before using it
if (robj == NULL) {
continue;
}

int bone = Lod[lod][model].BoneIndex;

robj->Set_Transform(HTree->Get_Transform(bone));
Expand All @@ -3368,6 +3384,11 @@ void HLodClass::Update_Sub_Object_Transforms(void)
for (model = 0; model < AdditionalModels.Count(); model++) {

RenderObjClass * robj = AdditionalModels[model].Model;
// Validate render object pointer before using it
if (robj == NULL) {
continue;
}

int bone = AdditionalModels[model].BoneIndex;

robj->Set_Transform(HTree->Get_Transform(bone));
Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,12 @@ void Animatable3DObjClass::Update_Sub_Object_Transforms(void)
*/
CompositeRenderObjClass::Update_Sub_Object_Transforms();

// Validate HTree exists before accessing it
if (HTree == NULL) {
Set_Hierarchy_Valid(true);
return;
}

/*
** Update the transforms
*/
Expand Down
21 changes: 21 additions & 0 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3348,15 +3348,31 @@ void HLodClass::Update_Sub_Object_Transforms(void)
*/
Animatable3DObjClass::Update_Sub_Object_Transforms();

// Validate HTree exists before accessing it
if (HTree == NULL) {
Set_Sub_Object_Transforms_Dirty(false);
return;
}

/*
** Put the computed transforms into our sub objects.
*/
int lod,model;

for (lod = 0; lod < LodCount; lod++) {
// Validate LOD array exists
if (Lod == NULL) {
break;
}

for (model = 0; model < Lod[lod].Count(); model++) {

RenderObjClass * robj = Lod[lod][model].Model;
// Validate render object pointer before using it
if (robj == NULL) {
continue;
}

int bone = Lod[lod][model].BoneIndex;

robj->Set_Transform(HTree->Get_Transform(bone));
Expand All @@ -3368,6 +3384,11 @@ void HLodClass::Update_Sub_Object_Transforms(void)
for (model = 0; model < AdditionalModels.Count(); model++) {

RenderObjClass * robj = AdditionalModels[model].Model;
// Validate render object pointer before using it
if (robj == NULL) {
continue;
}

int bone = AdditionalModels[model].BoneIndex;

robj->Set_Transform(HTree->Get_Transform(bone));
Expand Down
Loading