pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix possible crash with zone name methods. (#2055)

Browse Source 
- ZoneLongName and ZoneName were returning nullptr in places that were then attempting to use that nullptr value, causing zone crashes.
This commit is contained in:
Kinglykrab 2022-03-13 15:59:57 -04:00 committed by GitHub
parent 8e62383997
commit b75741ff4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/lua_general.cpp
View File

@ -1146,12 +1146,13 @@ const char *lua_get_zone_long_name() {
const char *lua_get_zone_long_name_by_name(const char* zone_name) { const char *lua_get_zone_long_name_by_name(const char* zone_name) {
return ZoneLongName( return ZoneLongName(
ZoneID(zone_name) ZoneID(zone_name),
true
); );
} }
const char *lua_get_zone_long_name_by_id(uint32 zone_id) { const char *lua_get_zone_long_name_by_id(uint32 zone_id) {
return ZoneLongName(zone_id); return ZoneLongName(zone_id, true);
} }
const char *lua_get_zone_short_name() { const char *lua_get_zone_short_name() {
@ -1162,7 +1163,7 @@ const char *lua_get_zone_short_name() {
} }
const char *lua_get_zone_short_name_by_id(uint32 zone_id) { const char *lua_get_zone_short_name_by_id(uint32 zone_id) {
return ZoneName(zone_id); return ZoneName(zone_id, true);
} }
int lua_get_zone_instance_id() { int lua_get_zone_instance_id() {

6
zone/questmgr.cpp
View File

@ -3234,15 +3234,15 @@ int32 QuestManager::GetZoneID(const char *zone) {
std::string QuestManager::GetZoneLongName(std::string zone_short_name) std::string QuestManager::GetZoneLongName(std::string zone_short_name)
{ {
return ZoneLongName(ZoneID(zone_short_name)); return ZoneLongName(ZoneID(zone_short_name), true);
} }
std::string QuestManager::GetZoneLongNameByID(uint32 zone_id) { std::string QuestManager::GetZoneLongNameByID(uint32 zone_id) {
return ZoneLongName(zone_id); return ZoneLongName(zone_id, true);
} }
std::string QuestManager::GetZoneShortName(uint32 zone_id) { std::string QuestManager::GetZoneShortName(uint32 zone_id) {
return ZoneName(zone_id); return ZoneName(zone_id, true);
} }
bool QuestManager::EnableRecipe(uint32 recipe_id) bool QuestManager::EnableRecipe(uint32 recipe_id)