Skip to content

AssetMgr: Add SEH protection against accessing freed prototype pointers #83

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
+24 −4
Open

AssetMgr: Add SEH protection against accessing freed prototype pointers #83

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
14 changes: 12 additions & 2 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1701,8 +1701,18 @@ PrototypeClass * WW3DAssetManager::Find_Prototype(const char * name)
PrototypeClass * test = PrototypeHashTable[hash];

while (test != NULL) {
if (stricmp(test->Get_Name(),name) == 0) {
return test;
// Defensive check: protect against accessing freed/invalid prototype pointers
// Use SEH to catch access violations from dangling pointers in the hash chain
__try {
const char* test_name = test->Get_Name();
if (test_name != NULL && stricmp(test_name, name) == 0) {
return test;
}
}
__except(EXCEPTION_EXECUTE_HANDLER) {
// Invalid pointer detected (use-after-free), stop traversing the chain
// This can happen if a prototype was deleted without being properly removed from the hash table
break;
}
test = test->friend_getNextHash();
}
Expand Down
14 changes: 12 additions & 2 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,8 +1678,18 @@ PrototypeClass * WW3DAssetManager::Find_Prototype(const char * name)
PrototypeClass * test = PrototypeHashTable[hash];

while (test != NULL) {
if (stricmp(test->Get_Name(),name) == 0) {
return test;
// Defensive check: protect against accessing freed/invalid prototype pointers
// Use SEH to catch access violations from dangling pointers in the hash chain
__try {
const char* test_name = test->Get_Name();
if (test_name != NULL && stricmp(test_name, name) == 0) {
return test;
}
}
__except(EXCEPTION_EXECUTE_HANDLER) {
// Invalid pointer detected (use-after-free), stop traversing the chain
// This can happen if a prototype was deleted without being properly removed from the hash table
break;
}
test = test->friend_getNextHash();
}
Expand Down
Loading