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

[Bug Fix] Fix nullptr spell in BCSpells::Load() (#2790)

Browse Source 
* [Bug Fix] Fix nullptr spell in BCSpells::Load()

# Notes
- Fix possible `nullptr` where we didn't check if spell was valid before using it.

* Cleanup.
This commit is contained in:
Alex King 2023-01-24 17:57:12 -05:00 committed by GitHub
parent bf39a0540c
commit 2b0c778ad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zone/bot_command.cpp
View File

@ -122,10 +122,20 @@ public:
} }
for (int spell_id = 2; spell_id < SPDAT_RECORDS; ++spell_id) { for (int spell_id = 2; spell_id < SPDAT_RECORDS; ++spell_id) {
if (spells[spell_id].player_1[0] == '\0') if (!IsValidSpell(spell_id)) {
continue; continue;
if (spells[spell_id].target_type != ST_Target && spells[spell_id].cast_restriction != 0) // watch }
if (spells[spell_id].player_1[0] == '\0') {
continue; continue;
}
if (
spells[spell_id].target_type != ST_Target &&
spells[spell_id].cast_restriction != 0
) {
continue;
}
auto target_type = BCEnum::TT_None; auto target_type = BCEnum::TT_None;
switch (spells[spell_id].target_type) { switch (spells[spell_id].target_type) {