Skip to content

Fix potential access violation when setting null texture on LineGroup in ParticleBuffer #199

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
+18 −4
Open

Fix potential access violation when setting null texture on LineGroup in ParticleBuffer #199

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
22 changes: 18 additions & 4 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,10 @@ ParticleBufferClass::ParticleBufferClass
{
LineGroup=W3DNEW LineGroupClass();
LineGroup->Set_Flag(LineGroupClass::TRANSFORM, true);
LineGroup->Set_Texture(tex);
// Only set texture if it's not NULL to prevent access violation
if (tex) {
LineGroup->Set_Texture(tex);
}
LineGroup->Set_Shader(shader);
LineGroup->Set_Line_Mode(LineGroupClass::TETRAHEDRON);
TailPosition = NEW_REF( ShareBufferClass<Vector3> , (MaxNum, "ParticleBufferClass::TailPosition" ) );
Expand All @@ -283,7 +286,10 @@ ParticleBufferClass::ParticleBufferClass
{
LineGroup=W3DNEW LineGroupClass();
LineGroup->Set_Flag(LineGroupClass::TRANSFORM, true);
LineGroup->Set_Texture(tex);
// Only set texture if it's not NULL to prevent access violation
if (tex) {
LineGroup->Set_Texture(tex);
}
LineGroup->Set_Shader(shader);
LineGroup->Set_Line_Mode(LineGroupClass::PRISM);
TailPosition = NEW_REF( ShareBufferClass<Vector3> , (MaxNum, "ParticleBufferClass::TailPosition" ) );
Expand Down Expand Up @@ -662,7 +668,11 @@ ParticleBufferClass::ParticleBufferClass(const ParticleBufferClass & src) :
WWASSERT(src.LineGroup);
LineGroup = W3DNEW LineGroupClass();
LineGroup->Set_Flag(LineGroupClass::TRANSFORM, true);
LineGroup->Set_Texture(src.LineGroup->Peek_Texture());
// Only set texture if it's not NULL to prevent access violation
TextureClass* srcTexture = src.LineGroup->Peek_Texture();
if (srcTexture) {
LineGroup->Set_Texture(srcTexture);
}
LineGroup->Set_Shader(src.LineGroup->Get_Shader());
LineGroup->Set_Line_Mode(LineGroupClass::TETRAHEDRON);
TailPosition = NEW_REF( ShareBufferClass<Vector3> , (MaxNum, "ParticleBufferClass::TailPosition") );
Expand All @@ -676,7 +686,11 @@ ParticleBufferClass::ParticleBufferClass(const ParticleBufferClass & src) :
WWASSERT(src.LineGroup);
LineGroup = W3DNEW LineGroupClass();
LineGroup->Set_Flag(LineGroupClass::TRANSFORM, true);
LineGroup->Set_Texture(src.LineGroup->Peek_Texture());
// Only set texture if it's not NULL to prevent access violation
TextureClass* srcTexture = src.LineGroup->Peek_Texture();
if (srcTexture) {
LineGroup->Set_Texture(srcTexture);
}
LineGroup->Set_Shader(src.LineGroup->Get_Shader());
LineGroup->Set_Line_Mode(LineGroupClass::PRISM);
TailPosition = NEW_REF( ShareBufferClass<Vector3> , (MaxNum, "ParticleBufferClass::TailPosition") );
Expand Down
Loading