Skip to content

Fix potential crash in WideCharStringToMultiByte with null or empty input #212

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
+13 −0
Open

Fix potential crash in WideCharStringToMultiByte with null or empty input #212

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
13 changes: 13 additions & 0 deletions Core/GameEngine/Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,19 @@ std::wstring MultiByteToWideCharSingleLine( const char *orig )
std::string WideCharStringToMultiByte( const WideChar *orig )
{
std::string ret;

// Check for null pointer to prevent crash
if (orig == NULL)
{
return ret; // Return empty string
}

// Check for empty string to avoid unnecessary processing
if (orig[0] == 0)
{
return ret; // Return empty string
}

Int len = WideCharToMultiByte( CP_UTF8, 0, orig, wcslen(orig), NULL, 0, NULL, NULL ) + 1;
if (len > 0)
{
Expand Down
Loading