Skip to content

fix: crash in ProtocolLogin (#4902) #4926

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

Merged
MillhioreBT merged 1 commit into from
Jun 5, 2025
Merged

fix: crash in ProtocolLogin (#4902) #4926

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
7 changes: 6 additions & 1 deletion src/protocollogin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ void ProtocolLogin::disconnectClient(const std::string& message, uint16_t versio
void ProtocolLogin::getCharacterList(const std::string& accountName, const std::string& password,
const std::string& token, uint16_t version)
{
auto connection = getConnection();
if (!connection) {
return;
}

Database& db = Database::getInstance();

DBResult_ptr result = db.storeQuery(fmt::format(
Expand Down Expand Up @@ -118,7 +123,7 @@ void ProtocolLogin::getCharacterList(const std::string& accountName, const std::
if (!db.executeQuery(
fmt::format("INSERT INTO `sessions` (`token`, `account_id`, `ip`) VALUES ({:s}, {:d}, INET6_ATON({:s}))",
db.escapeBlob(sessionKey.data(), sessionKey.size()), id,
db.escapeString(getConnection()->getIP().to_string())))) {
db.escapeString(connection->getIP().to_string())))) {
disconnectClient("Failed to create session.\nPlease try again later.", version);
return;
}
Expand Down
Loading