Skip to content

fix(w3ddevice): Add null check for tree tile RGB data in W3DTreeBuffer::drawTrees#552

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(w3ddevice): Add null check for tree tile RGB data in W3DTreeBuffer::drawTrees #552

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
8 changes: 7 additions & 1 deletion Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,9 @@ int W3DTreeBuffer::W3DTreeTextureClass::update(W3DTreeBuffer* buffer)
}
Int i, j;
for (j = 0; j < tilePixelExtent; j++) {
UnsignedByte* pBGR = pTile->getRGBDataForWidth(tilePixelExtent);
UnsignedByte* pTileRGB = pTile->getRGBDataForWidth(tilePixelExtent);
if (!pTileRGB) continue;
UnsignedByte* pBGR = pTileRGB;
pBGR += (tilePixelExtent - (1 + j)) * TILE_BYTES_PER_PIXEL * tilePixelExtent; // invert to match.
Int row = position.y + j;
UnsignedByte* pBGRA = ((UnsignedByte*)locked_rect.pBits) +
Expand DownExpand Up@@ -1989,4 +1991,8 @@ void W3DTreeBuffer::loadPostProcess()








Expand Down
Loading