Skip to content

Render2D: Add vertex data array size validation to prevent buffer overflows #87

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
+16 −3
Open

Render2D: Add vertex data array size validation to prevent buffer overflows #87

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
19 changes: 16 additions & 3 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,19 @@ void Render2DClass::Render(void)
return;
}

// Validate that all vertex data arrays have consistent sizes to prevent buffer overflow
int vertex_count = Vertices.Count();
int uv_count = UVCoordinates.Count();
int color_count = Colors.Count();

if (vertex_count != uv_count || vertex_count != color_count) {
// Arrays are out of sync - this is a critical error condition
// Reset to prevent rendering corrupted data
WWASSERT(0 && "Render2DClass vertex data arrays are out of sync");
Reset();
return;
}

// save the view and projection matrices since we're nuking them
Matrix4x4 view,proj;
Matrix4x4 identity(true);
Expand Down Expand Up @@ -562,14 +575,14 @@ void Render2DClass::Render(void)
DX8Wrapper::Set_View_Identity();
DX8Wrapper::Set_Transform(D3DTS_PROJECTION,identity);

DynamicVBAccessClass vb(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,Vertices.Count());
DynamicVBAccessClass vb(BUFFER_TYPE_DYNAMIC_DX8,dynamic_fvf_type,vertex_count);
{
DynamicVBAccessClass::WriteLockClass Lock(&vb);
const FVFInfoClass &fi=vb.FVF_Info();
unsigned char *vb=(unsigned char*)Lock.Get_Formatted_Vertex_Array();
int i;

for (i=0; i<Vertices.Count(); i++)
for (i=0; i<vertex_count; i++)
{
Vector3 temp(Vertices[i].X,Vertices[i].Y,ZValue);
*(Vector3*)(vb+fi.Get_Location_Offset())=temp;
Expand Down Expand Up @@ -617,7 +630,7 @@ void Render2DClass::Render(void)
else
DX8Wrapper::Set_Shader(Shader);

DX8Wrapper::Draw_Triangles(0,Indices.Count()/3,0,Vertices.Count());
DX8Wrapper::Draw_Triangles(0,Indices.Count()/3,0,vertex_count);
// SphereClass sphere(Vector3(0.0f,0.0f,0.0f),0.0f);
// SortingRendererClass::Insert_Triangles(sphere,0,Indices.Count()/3,0,Vertices.Count());

Expand Down