pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 01:08:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Crash] Stability Fixes (#2489)

Browse Source 
* Input sanitation for #zone

* Update zone.cpp

* Update clientlist.cpp

* Test

* Test

* Remove logging, revert /who all code

* Remove log

* Update clientlist.cpp
This commit is contained in:
Chris Miles
2022-10-15 15:17:50 -05:00
committed by GitHub
parent bbbebdd346
commit 7092183103
5 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/zone.cpp
+43 -24
View File
@@ -8,9 +8,38 @@ void command_zone(Client *c, const Seperator *sep)
return;
}
std::string zone_identifier = sep->arg[1];
// input: (first arg)
// zone identifier can be a string of a zone name or its ID
std::string zone_input = sep->arg[1];
uint32 zone_id = 0;
if (Strings::IsNumber(zone_identifier) && zone_identifier == "0") {
// if input is id
if (Strings::IsNumber(zone_input)) {
zone_id = std::stoi(zone_input);
// validate
if (!GetZone(zone_id)) {
c->Message(Chat::White, fmt::format("Could not find zone by id [{}]", zone_id).c_str());
return;
}
}
else {
// validate
if (!zone_store.GetZone(zone_input)) {
c->Message(Chat::White, fmt::format("Could not find zone by short_name [{}]", zone_input).c_str());
return;
}
// validate we got id
zone_id = ZoneID(zone_input);
if (zone_id == 0) {
c->Message(Chat::White, fmt::format("Could not find zone id by short_name [{}]", zone_input).c_str());
return;
}
}
// if zone identifier is a number and the id is 0, send to safe coordinates of the local zone
if (Strings::IsNumber(zone_input) && zone_id == 0) {
c->Message(Chat::White, "Sending you to the safe coordinates of this zone.");
c->MovePC(
@@ -24,23 +53,7 @@ void command_zone(Client *c, const Seperator *sep)
return;
}
auto zone_id = (
sep->IsNumber(1) ?
std::stoul(zone_identifier) :
ZoneID(zone_identifier)
);
auto zone_short_name = ZoneName(zone_id);
if (!zone_id || !zone_short_name) {
c->Message(
Chat::White,
fmt::format(
"No zones were found matching '{}'.",
zone_identifier
).c_str()
);
return;
}
// status checking
auto min_status = content_db.GetMinStatus(zone_id, 0);
if (c->Admin() < min_status) {
c->Message(Chat::White, "Your status is not high enough to go to this zone.");
@@ -54,12 +67,18 @@ void command_zone(Client *c, const Seperator *sep)
}
#endif
auto x = sep->IsNumber(2) ? std::stof(sep->arg[2]) : 0.0f;
auto y = sep->IsNumber(3) ? std::stof(sep->arg[3]) : 0.0f;
auto z = sep->IsNumber(4) ? std::stof(sep->arg[4]) : 0.0f;
auto zone_mode = sep->IsNumber(2) ? ZoneSolicited : ZoneToSafeCoords;
// fetch zone data
auto zd = GetZoneVersionWithFallback(zone_id, 0);
if (zone_id == 0) {
c->Message(Chat::White, fmt::format("Failed to find zone with fallback [{}]", zone_id).c_str());
return;
}
auto zd = GetZone(zone_id);
// coordinates
auto x = sep->IsNumber(2) ? std::stof(sep->arg[2]) : 0.0f;
auto y = sep->IsNumber(3) ? std::stof(sep->arg[3]) : 0.0f;
auto z = sep->IsNumber(4) ? std::stof(sep->arg[4]) : 0.0f;
auto zone_mode = sep->IsNumber(2) ? ZoneSolicited : ZoneToSafeCoords;
c->MovePC(
zone_id,