Skip to content

TerrainTex: Add NULL checks for RGB data to prevent crashes #67

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

Draft
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −0
Draft

TerrainTex: Add NULL checks for RGB data to prevent crashes #67

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
6 changes: 6 additions & 0 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ int TerrainTextureClass::update(WorldHeightMap *htMap)
Int i,j;
for (j=0; j<tilePixelExtent; j++) {
UnsignedByte *pBGR = pTile->getRGBDataForWidth(tilePixelExtent);
// Check if getRGBDataForWidth returned NULL (e.g., corrupted tile data)
if (!pBGR) continue;
pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
Int row = position.y+j;
UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
Expand Down Expand Up @@ -414,6 +416,8 @@ int TerrainTextureClass::update256(WorldHeightMap *htMap)
Int i,j;
for (j=0; j<tilePixelExtent; j++) {
UnsignedByte *pBGR = htMap->getSourceTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
// Check if getRGBDataForWidth returned NULL (e.g., corrupted tile data)
if (!pBGR) continue;
pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
Int row = cellY*tilePixelExtent+j;
row += tileOffset/2;
Expand Down Expand Up @@ -880,6 +884,8 @@ int AlphaEdgeTextureClass::update(WorldHeightMap *htMap)
for (j=0; j<tilePixelExtent; j++) {
Int row = position.y+j;
UnsignedByte *pBGR = htMap->getEdgeTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
// Check if getRGBDataForWidth returned NULL (e.g., corrupted tile data)
if (!pBGR) continue;
pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
(row)*surface_desc.Width*pixelBytes;
Expand Down
8 changes: 8 additions & 0 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,14 @@ void WorldHeightMap::readTexClass(TXTextureClass *texClass, TileData **tileData)
WorldHeightMap::readTiles(pStr, tileData+texClass->firstTile, width);
}
theFile->close();
} else {
// Failed to open texture file - ensure all tiles for this class are NULL
// to prevent crashes when rendering tries to use uninitialized data
for (Int i = 0; i < texClass->numTiles; i++) {
if (tileData[texClass->firstTile + i] == NULL) {
tileData[texClass->firstTile + i] = NULL; // Explicitly set to NULL
}
}
}
}

Expand Down