incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash checks on proxy server

Browse Source
This commit is contained in:
Martin Michelsen
2022-10-15 22:23:53 -07:00
parent 378fd0521e
commit 0e53ea08ba
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProxyCommands.cc
+8 -5
View File
@@ -858,9 +858,7 @@ static HandlerResult S_6x(shared_ptr<ServerState>,
} }
} }
if (!data.empty() && if (!data.empty()) {
session.next_drop_item.data.data1d[0] &&
(session.version != GameVersion::BB)) {
if (data[0] == 0x46) { if (data[0] == 0x46) {
const auto& cmd = check_size_t<G_AttackFinished_6x46>(data, const auto& cmd = check_size_t<G_AttackFinished_6x46>(data,
offsetof(G_AttackFinished_6x46, entries), offsetof(G_AttackFinished_6x46, entries),
@@ -888,7 +886,9 @@ static HandlerResult S_6x(shared_ptr<ServerState>,
session.log.warning("Blocking subcommand 6x49 with invalid count"); session.log.warning("Blocking subcommand 6x49 with invalid count");
return HandlerResult::Type::SUPPRESS; return HandlerResult::Type::SUPPRESS;
} }
} else if (data[0] == 0x60) { } else if ((data[0] == 0x60) &&
session.next_drop_item.data.data1d[0] &&
(session.version != GameVersion::BB)) {
const auto& cmd = check_size_t<G_EnemyDropItemRequest_DC_6x60>(data, const auto& cmd = check_size_t<G_EnemyDropItemRequest_DC_6x60>(data,
sizeof(G_EnemyDropItemRequest_DC_6x60), sizeof(G_EnemyDropItemRequest_DC_6x60),
sizeof(G_EnemyDropItemRequest_PC_V3_BB_6x60)); sizeof(G_EnemyDropItemRequest_PC_V3_BB_6x60));
@@ -899,11 +899,14 @@ static HandlerResult S_6x(shared_ptr<ServerState>,
true, cmd.area, cmd.x, cmd.z, cmd.request_id); true, cmd.area, cmd.x, cmd.z, cmd.request_id);
session.next_drop_item.clear(); session.next_drop_item.clear();
return HandlerResult::Type::SUPPRESS; return HandlerResult::Type::SUPPRESS;
// Note: This static_cast is required to make compilers not complain that // Note: This static_cast is required to make compilers not complain that
// the comparison is always false (which even happens in some environments // the comparison is always false (which even happens in some environments
// if we use -0x5E... apparently char is unsigned on some systems, or // if we use -0x5E... apparently char is unsigned on some systems, or
// std::string's char_type isn't char??) // std::string's char_type isn't char??)
} else if (static_cast<uint8_t>(data[0]) == 0xA2) { } else if ((static_cast<uint8_t>(data[0]) == 0xA2) &&
session.next_drop_item.data.data1d[0] &&
(session.version != GameVersion::BB)) {
const auto& cmd = check_size_t<G_BoxItemDropRequest_6xA2>(data); const auto& cmd = check_size_t<G_BoxItemDropRequest_6xA2>(data);
session.next_drop_item.data.id = session.next_item_id++; session.next_drop_item.data.id = session.next_item_id++;
send_drop_item(session.server_channel, session.next_drop_item.data, send_drop_item(session.server_channel, session.next_drop_item.data,