Skip to content

DX8VertexBuffer: Add null checks after dynamic vertex buffer creation and before locking #129

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
+54 −2
Open

DX8VertexBuffer: Add null checks after dynamic vertex buffer creation and before locking #129

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: 27 additions & 1 deletion Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,15 @@ void DynamicVBAccessClass::Allocate_DX8_Dynamic_Buffer()
_DynamicDX8VertexBufferSize,
(DX8VertexBufferClass::UsageType)usage));
_DynamicDX8VertexBufferOffset=0;

// Check if vertex buffer creation failed
if (!_DynamicDX8VertexBuffer) {
WWDEBUG_SAY(("ERROR: Failed to create dynamic DX8 vertex buffer (size: %d vertices)", _DynamicDX8VertexBufferSize));
_DynamicDX8VertexBufferInUse=false;
VertexBuffer=NULL;
VertexBufferOffset=0;
return;
}
}

// Any room at the end of the buffer?
Expand Down Expand Up @@ -808,6 +817,15 @@ void DynamicVBAccessClass::Allocate_Sorting_Dynamic_Buffer()
if (!_DynamicSortingVertexArray) {
_DynamicSortingVertexArray=NEW_REF(SortingVertexBufferClass,(_DynamicSortingVertexArraySize));
_DynamicSortingVertexArrayOffset=0;

// Check if vertex buffer creation failed
if (!_DynamicSortingVertexArray) {
WWDEBUG_SAY(("ERROR: Failed to create dynamic sorting vertex buffer (size: %d vertices)", _DynamicSortingVertexArraySize));
_DynamicSortingVertexArrayInUse=false;
VertexBuffer=NULL;
VertexBufferOffset=0;
return;
}
}

REF_PTR_SET(VertexBuffer,_DynamicSortingVertexArray);
Expand All @@ -818,9 +836,17 @@ void DynamicVBAccessClass::Allocate_Sorting_Dynamic_Buffer()
static int dx8_lock;
DynamicVBAccessClass::WriteLockClass::WriteLockClass(DynamicVBAccessClass* dynamic_vb_access_)
:
DynamicVBAccess(dynamic_vb_access_)
DynamicVBAccess(dynamic_vb_access_),
Vertices(NULL)
{
DX8_THREAD_ASSERT();

// Add defensive null check for VertexBuffer
if (!DynamicVBAccess->VertexBuffer) {
WWDEBUG_SAY(("ERROR: Cannot lock NULL vertex buffer in DynamicVBAccessClass::WriteLockClass"));
return;
}

switch (DynamicVBAccess->Get_Type()) {
case BUFFER_TYPE_DYNAMIC_DX8:
#ifdef VERTEX_BUFFER_LOG
Expand Down
28 changes: 27 additions & 1 deletion GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,15 @@ void DynamicVBAccessClass::Allocate_DX8_Dynamic_Buffer()
_DynamicDX8VertexBufferSize,
(DX8VertexBufferClass::UsageType)usage));
_DynamicDX8VertexBufferOffset=0;

// Check if vertex buffer creation failed
if (!_DynamicDX8VertexBuffer) {
WWDEBUG_SAY(("ERROR: Failed to create dynamic DX8 vertex buffer (size: %d vertices)", _DynamicDX8VertexBufferSize));
_DynamicDX8VertexBufferInUse=false;
VertexBuffer=NULL;
VertexBufferOffset=0;
return;
}
}

// Any room at the end of the buffer?
Expand Down Expand Up @@ -820,6 +829,15 @@ void DynamicVBAccessClass::Allocate_Sorting_Dynamic_Buffer()
if (!_DynamicSortingVertexArray) {
_DynamicSortingVertexArray=NEW_REF(SortingVertexBufferClass,(_DynamicSortingVertexArraySize));
_DynamicSortingVertexArrayOffset=0;

// Check if vertex buffer creation failed
if (!_DynamicSortingVertexArray) {
WWDEBUG_SAY(("ERROR: Failed to create dynamic sorting vertex buffer (size: %d vertices)", _DynamicSortingVertexArraySize));
_DynamicSortingVertexArrayInUse=false;
VertexBuffer=NULL;
VertexBufferOffset=0;
return;
}
}

REF_PTR_SET(VertexBuffer,_DynamicSortingVertexArray);
Expand All @@ -830,9 +848,17 @@ void DynamicVBAccessClass::Allocate_Sorting_Dynamic_Buffer()
static int dx8_lock;
DynamicVBAccessClass::WriteLockClass::WriteLockClass(DynamicVBAccessClass* dynamic_vb_access_)
:
DynamicVBAccess(dynamic_vb_access_)
DynamicVBAccess(dynamic_vb_access_),
Vertices(NULL)
{
DX8_THREAD_ASSERT();

// Add defensive null check for VertexBuffer
if (!DynamicVBAccess->VertexBuffer) {
WWDEBUG_SAY(("ERROR: Cannot lock NULL vertex buffer in DynamicVBAccessClass::WriteLockClass"));
return;
}

switch (DynamicVBAccess->Get_Type()) {
case BUFFER_TYPE_DYNAMIC_DX8:
#ifdef VERTEX_BUFFER_LOG
Expand Down
Loading