Skip to content

bugfix(handles): Close leaked thread, find and file handles #3497

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
tintinhamans wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Open

bugfix(handles): Close leaked thread, find and file handles #3497

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
2 changes: 2 additions & 0 deletions Core/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2784,6 +2784,8 @@ GameWindow *GameWindowManager::winCreateFromScript( AsciiString filenameString,
{

DEBUG_LOG(( "WinCreateFromScript: Error parsing layout block" ));
inFile->close();
inFile = nullptr;
return nullptr;

}
Expand Down
4 changes: 3 additions & 1 deletion Core/GameEngine/Source/GameClient/System/Image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,10 @@ void ImageCollection::load( Int textureSize )
if(TheGlobalData)
{
userDataPath.format("%sINI\\MappedImages\\*.ini",TheGlobalData->getPath_UserData().str());
if(FindFirstFile(userDataPath.str(), &findData) !=INVALID_HANDLE_VALUE)
HANDLE findHandle = FindFirstFile(userDataPath.str(), &findData);
if(findHandle != INVALID_HANDLE_VALUE)
{
FindClose(findHandle);
userDataPath.format("%sINI\\MappedImages",TheGlobalData->getPath_UserData().str());
ini.loadDirectory(userDataPath, INI_LOAD_OVERWRITE, nullptr );
}
Expand Down
2 changes: 2 additions & 0 deletions Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,7 @@ int asyncGethostbyname(char * szName)
/* Thread finished */
stat = 0;
s_asyncDNSLookupInProgress = FALSE;
CloseHandle(s_asyncDNSThreadHandle);
s_asyncDNSThreadHandle = nullptr;
return( (s_asyncDNSThreadSucceeded)?LOOKUP_SUCCEEDED:LOOKUP_FAILED );
}
Expand Down Expand Up @@ -811,6 +812,7 @@ void StopAsyncDNSCheck()
MAYBE_UNUSED Int res = TerminateThread(s_asyncDNSThreadHandle, 0);
(void)res;
DEBUG_ASSERTCRASH(res, ("Could not terminate the Async DNS Lookup thread!")); // Thread still not killed!
CloseHandle(s_asyncDNSThreadHandle);
}
s_asyncDNSThreadHandle = nullptr;
s_asyncDNSLookupInProgress = FALSE;
Expand Down
Loading