Skip to content

fix possible crash due to string conversion error #5018

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
asamy wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix possible crash due to string conversion error #5018

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
faa939b
fix possible crash due to string conversion error
asamy Oct 24, 2025
93e810f
formatting
asamy Oct 24, 2025
0d5ed78
add empty string incase of conversion error and log it out
asamy Oct 25, 2025
0524d24
formatting
asamy Oct 25, 2025
c2bcd15
avoid spills, its only 1 arg, so can use int regs
asamy Oct 27, 2025
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
20 changes: 15 additions & 5 deletions src/networkmessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@ std::string NetworkMessage::getString(uint16_t stringLen /* = 0*/)
auto it = buffer.data() + info.position;
info.position += stringLen;

std::string_view latin1Str{reinterpret_cast<char*>(it), stringLen};
return boost::locale::conv::to_utf<char>(latin1Str.data(), latin1Str.data() + latin1Str.size(), "ISO-8859-1",
boost::locale::conv::skip);
try {
std::string_view latin1Str{reinterpret_cast<char*>(it), stringLen};
return boost::locale::conv::to_utf<char>(latin1Str.data(), latin1Str.data() + latin1Str.size(), "ISO-8859-1",
boost::locale::conv::skip);
} catch (const boost::locale::conv::conversion_error&) {
return {};
}
}

Position NetworkMessage::getPosition()
Expand All @@ -39,8 +43,14 @@ Position NetworkMessage::getPosition()

void NetworkMessage::addString(std::string_view value)
{
std::string latin1Str = boost::locale::conv::from_utf<char>(value.data(), value.data() + value.size(), "ISO-8859-1",
boost::locale::conv::skip);
std::string latin1Str;
try {
latin1Str = boost::locale::conv::from_utf<char>(value.data(), value.data() + value.size(), "ISO-8859-1",
boost::locale::conv::skip);
} catch (const boost::locale::conv::conversion_error&) {
return;
}

size_t stringLen = latin1Str.size();
Comment thread
asamy marked this conversation as resolved.
Outdated
if (!canAdd(stringLen + 2) || stringLen > 8192) {
return;
Expand Down
Loading