pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-16 04:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Fix possible nullptr inst in GetSharedBank() (#3190)

Browse Source 
* [Cleanup] Fix possible nullptr inst in GetSharedBank()

# Notes
- We weren't continuing if we had a `nullptr`.

* Update shareddb.cpp

* Fix.
This commit is contained in:
Alex King 2023-04-08 09:42:10 -04:00 committed by GitHub
parent b3ab7deb80
commit 25b527156c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
common/shareddb.cpp
View File

@ -495,25 +495,31 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
{ {
std::string query; std::string query;
if (is_charid) if (is_charid) {
query = StringFormat("SELECT sb.slotid, sb.itemid, sb.charges, " query = fmt::format(
"sb.augslot1, sb.augslot2, sb.augslot3, " "SELECT sb.slotid, sb.itemid, sb.charges, "
"sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data " "sb.augslot1, sb.augslot2, sb.augslot3, "
"FROM sharedbank sb INNER JOIN character_data ch " "sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data "
"ON ch.account_id=sb.acctid WHERE ch.id = %i ORDER BY sb.slotid", "FROM sharedbank sb INNER JOIN character_data ch "
id); "ON ch.account_id = sb.acctid WHERE ch.id = {} ORDER BY sb.slotid",
else id
query = StringFormat("SELECT slotid, itemid, charges, " );
"augslot1, augslot2, augslot3, " } else {
"augslot4, augslot5, augslot6, custom_data " query = fmt::format(
"FROM sharedbank WHERE acctid=%i ORDER BY slotid", "SELECT slotid, itemid, charges, "
id); "augslot1, augslot2, augslot3, "
"augslot4, augslot5, augslot6, custom_data "
"FROM sharedbank WHERE acctid = {} ORDER BY slotid",
id
);
}
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) { if (!results.Success() || !results.RowCount()) {
return false; return false;
} }
for (auto& row = results.begin(); row != results.end(); ++row) { for (auto row : results) {
int16 slot_id = static_cast<int16>(Strings::ToInt(row[0])); int16 slot_id = static_cast<int16>(Strings::ToInt(row[0]));
uint32 item_id = Strings::ToUnsignedInt(row[1]); uint32 item_id = Strings::ToUnsignedInt(row[1]);
const int16 charges = static_cast<int16>(Strings::ToInt(row[2])); const int16 charges = static_cast<int16>(Strings::ToInt(row[2]));
@ -529,16 +535,26 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
const EQ::ItemData *item = GetItem(item_id); const EQ::ItemData *item = GetItem(item_id);
if (!item) { if (!item) {
LogError("Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]", LogError(
((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id); "Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]",
is_charid ? "charid" : "acctid",
id,
item_id,
slot_id
);
continue;
}
auto inst = CreateBaseItem(item, charges);
if (!inst) {
continue; continue;
} }
EQ::ItemInstance *inst = CreateBaseItem(item, charges);
if (inst && item->IsClassCommon()) { if (inst && item->IsClassCommon()) {
for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) { for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
if (aug[i]) if (aug[i]) {
inst->PutAugment(this, i, aug[i]); inst->PutAugment(this, i, aug[i]);
}
} }
} }
@ -552,14 +568,21 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
safe_delete(inst); safe_delete(inst);
// Save ptr to item in inventory // Save ptr to item in inventory
if (put_slot_id != INVALID_INDEX) if (put_slot_id != INVALID_INDEX) {
continue; continue;
}
LogError("Warning: Invalid slot_id for item in shared bank inventory: [{}]=[{}], item_id=[{}], slot_id=[{}]", LogError(
((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id); "Warning: Invalid slot_id for item in shared bank inventory: [{}]=[{}], item_id=[{}], slot_id=[{}]",
is_charid ? "charid" : "acctid",
id,
item_id,
slot_id
);
if (is_charid) if (is_charid) {
SaveInventory(id, nullptr, slot_id); SaveInventory(id, nullptr, slot_id);
}
} }
return true; return true;