Skip to content

TextureLoadTask: Guard against NULL D3DTexture pointer dereference during surface locking #163

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
+15 −0
Open

TextureLoadTask: Guard against NULL D3DTexture pointer dereference during surface locking #163

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
15 changes: 15 additions & 0 deletions Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,7 @@
//Figure out correct reduction
int reqReduction=WW3D::Get_Texture_Reduction(); //requested reduction

if (reqReduction >= mip_count)

Check warning on line 1329 in Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 '>=': signed/unsigned mismatch

Check warning on line 1329 in Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 '>=': signed/unsigned mismatch

Check warning on line 1329 in Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 '>=': signed/unsigned mismatch
reqReduction=mip_count-1; //leave only the lowest level

//Clamp reduction
Expand Down Expand Up @@ -1363,7 +1363,7 @@
//Figure out correct reduction
int reqReduction=WW3D::Get_Texture_Reduction(); //requested reduction

if (reqReduction >= mip_count)

Check warning on line 1366 in Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 '>=': signed/unsigned mismatch

Check warning on line 1366 in Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 '>=': signed/unsigned mismatch

Check warning on line 1366 in Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 '>=': signed/unsigned mismatch
reqReduction=mip_count-1; //leave only the lowest level

//Clamp reduction
Expand Down Expand Up @@ -1775,6 +1775,11 @@

void TextureLoadTaskClass::Lock_Surfaces(void)
{
// Guard against NULL pointer dereference
if (!D3DTexture) {
return;
}

MipLevelCount = D3DTexture->GetLevelCount();

for (unsigned int i = 0; i < MipLevelCount; ++i)
Expand Down Expand Up @@ -2154,6 +2159,11 @@

void CubeTextureLoadTaskClass::Lock_Surfaces(void)
{
// Guard against NULL pointer dereference
if (!D3DTexture) {
return;
}

for (unsigned int f=0; f<6; f++)
{
for (unsigned int i=0; i<MipLevelCount; i++)
Expand Down Expand Up @@ -2526,6 +2536,11 @@

void VolumeTextureLoadTaskClass::Lock_Surfaces()
{
// Guard against NULL pointer dereference
if (!D3DTexture) {
return;
}

for (unsigned int i=0; i<MipLevelCount; i++)
{
D3DLOCKED_BOX locked_box;
Expand Down
Loading