Skip to content

W3DTreeBuffer: Add bounds checks for treeType index access #188

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
+25 −5
Open

W3DTreeBuffer: Add bounds checks for treeType index access #188

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
28 changes: 23 additions & 5 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,23 +1184,31 @@ void W3DTreeBuffer::unitMoved(Object *unit)
DEBUG_CRASH(("Invalid index."));
break;
}
if (m_trees[treeNdx].treeType<0) {
Int treeType = m_trees[treeNdx].treeType;
if (treeType<0) {
treeNdx = m_trees[treeNdx].nextInPartition;
continue; // Tree is deleted. [7/11/2003]
}
// Additional bounds check to prevent out-of-bounds access to m_treeTypes array
if (treeType >= m_numTreeTypes) {
DEBUG_CRASH(("Invalid tree type index."));
treeNdx = m_trees[treeNdx].nextInPartition;
continue;
}

Coord3D delta;
delta.set(m_trees[treeNdx].location.X, m_trees[treeNdx].location.Y, m_trees[treeNdx].location.Z );
delta.sub(&pos);
if (radius*radius>delta.lengthSqr()) {
bool canTopple = unit->getCrusherLevel() > 1;
if (canTopple && m_treeTypes[m_trees[treeNdx].treeType].m_data->m_doTopple) {
if (canTopple && m_treeTypes[treeType].m_data->m_doTopple) {
// Give a vector with direction to thing.
Coord3D toppleVector;
toppleVector.set(m_trees[treeNdx].location.X, m_trees[treeNdx].location.Y, 0);
toppleVector.x -= unit->getPosition()->x;
toppleVector.y -= unit->getPosition()->y;
applyTopplingForce(m_trees+treeNdx, &toppleVector, 0, W3D_TOPPLE_OPTIONS_NONE);
} else if (m_treeTypes[m_trees[treeNdx].treeType].m_data->m_framesToMoveOutward>1) {
} else if (m_treeTypes[treeType].m_data->m_framesToMoveOutward>1) {
pushAsideTree(m_trees[treeNdx].drawableID, &pos, unit->getUnitDirectionVector2D(), unit->getID());
}
}
Expand Down Expand Up @@ -1469,7 +1477,10 @@ Bool W3DTreeBuffer::updateTreePosition(DrawableID id, Coord3D location, Real ang
m_trees[i].sin = WWMath::Sin(angle);
m_trees[i].cos = WWMath::Cos(angle);
// Translate the bounding sphere of the model.
m_trees[i].bounds = m_treeTypes[m_trees[i].treeType].m_bounds;
Int treeType = m_trees[i].treeType;
if (treeType >= 0 && treeType < m_numTreeTypes) {
m_trees[i].bounds = m_treeTypes[treeType].m_bounds;
}
m_trees[i].bounds.Center *= m_trees[i].scale;
m_trees[i].bounds.Radius *= m_trees[i].scale;
m_trees[i].bounds.Center += m_trees[i].location;
Expand Down Expand Up @@ -1514,7 +1525,10 @@ void W3DTreeBuffer::pushAsideTree(DrawableID id, const Coord3D *pusherPos,
m_trees[i].pushAsideSin = -pusherDirection->x;
}
m_anyPushChanged = true;
m_trees[i].pushAsideDelta = 1.0f/(Real)m_treeTypes[m_trees[i].treeType].m_data->m_framesToMoveOutward;
Int treeType = m_trees[i].treeType;
if (treeType >= 0 && treeType < m_numTreeTypes) {
m_trees[i].pushAsideDelta = 1.0f/(Real)m_treeTypes[treeType].m_data->m_framesToMoveOutward;
}
}
}
}
Expand Down Expand Up @@ -2038,3 +2052,7 @@ void W3DTreeBuffer::loadPostProcess( void )







2 changes: 2 additions & 0 deletions tmp/test_whitespace.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Line with tabs: if (m_trees[treeNdx].treeType<0) {
Line with spaces: if (m_trees[treeNdx].treeType<0) {
Loading