Skip to content

DX8IndexBuffer: Add null checks before using index_buffer #113

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
+50 −28
Open

DX8IndexBuffer: Add null checks before using index_buffer #113

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
39 changes: 25 additions & 14 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,13 @@ IndexBufferClass::WriteLockClass::WriteLockClass(IndexBufferClass* index_buffer_
switch (index_buffer->Type()) {
case BUFFER_TYPE_DX8:
DX8_Assert();
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->Get_DX8_Index_Buffer()->Lock(
0,
index_buffer->Get_Index_Count()*sizeof(WORD),
(unsigned char**)&indices,
flags));
if (static_cast<DX8IndexBufferClass*>(index_buffer)->Get_DX8_Index_Buffer()) {
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->Get_DX8_Index_Buffer()->Lock(
0,
index_buffer->Get_Index_Count()*sizeof(WORD),
(unsigned char**)&indices,
flags));
}
break;
case BUFFER_TYPE_SORTING:
indices=static_cast<SortingIndexBufferClass*>(index_buffer)->index_buffer;
Expand All @@ -216,7 +218,9 @@ IndexBufferClass::WriteLockClass::~WriteLockClass()
switch (index_buffer->Type()) {
case BUFFER_TYPE_DX8:
DX8_Assert();
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Unlock());
if (static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer) {
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Unlock());
}
break;
case BUFFER_TYPE_SORTING:
break;
Expand All @@ -241,11 +245,13 @@ IndexBufferClass::AppendLockClass::AppendLockClass(IndexBufferClass* index_buffe
switch (index_buffer->Type()) {
case BUFFER_TYPE_DX8:
DX8_Assert();
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Lock(
start_index*sizeof(unsigned short),
index_range*sizeof(unsigned short),
(unsigned char**)&indices,
0));
if (static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer) {
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Lock(
start_index*sizeof(unsigned short),
index_range*sizeof(unsigned short),
(unsigned char**)&indices,
0));
}
break;
case BUFFER_TYPE_SORTING:
indices=static_cast<SortingIndexBufferClass*>(index_buffer)->index_buffer+start_index;
Expand All @@ -264,7 +270,9 @@ IndexBufferClass::AppendLockClass::~AppendLockClass()
switch (index_buffer->Type()) {
case BUFFER_TYPE_DX8:
DX8_Assert();
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Unlock());
if (static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer) {
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Unlock());
}
break;
case BUFFER_TYPE_SORTING:
break;
Expand All @@ -283,7 +291,8 @@ IndexBufferClass::AppendLockClass::~AppendLockClass()

DX8IndexBufferClass::DX8IndexBufferClass(unsigned short index_count_,UsageType usage)
:
IndexBufferClass(BUFFER_TYPE_DX8,index_count_)
IndexBufferClass(BUFFER_TYPE_DX8,index_count_),
index_buffer(NULL)
{
DX8_THREAD_ASSERT();
WWASSERT(index_count);
Expand All @@ -305,7 +314,9 @@ DX8IndexBufferClass::DX8IndexBufferClass(unsigned short index_count_,UsageType u

DX8IndexBufferClass::~DX8IndexBufferClass()
{
index_buffer->Release();
if (index_buffer) {
index_buffer->Release();
}
}

// ----------------------------------------------------------------------------
Expand Down
39 changes: 25 additions & 14 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,13 @@ IndexBufferClass::WriteLockClass::WriteLockClass(IndexBufferClass* index_buffer_
switch (index_buffer->Type()) {
case BUFFER_TYPE_DX8:
DX8_Assert();
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->Get_DX8_Index_Buffer()->Lock(
0,
index_buffer->Get_Index_Count()*sizeof(WORD),
(unsigned char**)&indices,
flags));
if (static_cast<DX8IndexBufferClass*>(index_buffer)->Get_DX8_Index_Buffer()) {
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->Get_DX8_Index_Buffer()->Lock(
0,
index_buffer->Get_Index_Count()*sizeof(WORD),
(unsigned char**)&indices,
flags));
}
break;
case BUFFER_TYPE_SORTING:
indices=static_cast<SortingIndexBufferClass*>(index_buffer)->index_buffer;
Expand All @@ -217,7 +219,9 @@ IndexBufferClass::WriteLockClass::~WriteLockClass()
switch (index_buffer->Type()) {
case BUFFER_TYPE_DX8:
DX8_Assert();
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Unlock());
if (static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer) {
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Unlock());
}
break;
case BUFFER_TYPE_SORTING:
break;
Expand All @@ -242,11 +246,13 @@ IndexBufferClass::AppendLockClass::AppendLockClass(IndexBufferClass* index_buffe
switch (index_buffer->Type()) {
case BUFFER_TYPE_DX8:
DX8_Assert();
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Lock(
start_index*sizeof(unsigned short),
index_range*sizeof(unsigned short),
(unsigned char**)&indices,
0));
if (static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer) {
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Lock(
start_index*sizeof(unsigned short),
index_range*sizeof(unsigned short),
(unsigned char**)&indices,
0));
}
break;
case BUFFER_TYPE_SORTING:
indices=static_cast<SortingIndexBufferClass*>(index_buffer)->index_buffer+start_index;
Expand All @@ -265,7 +271,9 @@ IndexBufferClass::AppendLockClass::~AppendLockClass()
switch (index_buffer->Type()) {
case BUFFER_TYPE_DX8:
DX8_Assert();
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Unlock());
if (static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer) {
DX8_ErrorCode(static_cast<DX8IndexBufferClass*>(index_buffer)->index_buffer->Unlock());
}
break;
case BUFFER_TYPE_SORTING:
break;
Expand All @@ -284,7 +292,8 @@ IndexBufferClass::AppendLockClass::~AppendLockClass()

DX8IndexBufferClass::DX8IndexBufferClass(unsigned short index_count_,UsageType usage)
:
IndexBufferClass(BUFFER_TYPE_DX8,index_count_)
IndexBufferClass(BUFFER_TYPE_DX8,index_count_),
index_buffer(NULL)
{
DX8_THREAD_ASSERT();
WWASSERT(index_count);
Expand Down Expand Up @@ -338,7 +347,9 @@ DX8IndexBufferClass::DX8IndexBufferClass(unsigned short index_count_,UsageType u

DX8IndexBufferClass::~DX8IndexBufferClass()
{
index_buffer->Release();
if (index_buffer) {
index_buffer->Release();
}
}

// ----------------------------------------------------------------------------
Expand Down
Loading