Skip to content

fix: crash getItems #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luanluciano93 merged 4 commits into from
Oct 5, 2024
Merged

fix: crash getItems #892

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2927ba
Update protocolgameparse.cpp
luanluciano93 Sep 28, 2024
9fb0446
Merge branch 'main' into fix-getItems
luanluciano93 Oct 1, 2024
71da27a
Update protocolgameparse.cpp
luanluciano93 Oct 4, 2024
829634f
Merge branch 'main' into fix-getItems
luanluciano93 Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/client/protocolgameparse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,10 +1369,11 @@ void ProtocolGame::parseOpenContainer(const InputMessagePtr& msg)
}

const uint8_t itemCount = msg->getU8();
std::vector<ItemPtr> items(itemCount);
std::vector<ItemPtr> items;
items.reserve(itemCount);

for (auto i = 0; i < itemCount; i++) {
items[i] = getItem(msg);
items.push_back(getItem(msg));
}

if (g_game.getFeature(Otc::GameContainerFilter)) {
Expand Down Expand Up @@ -1556,9 +1557,10 @@ void ProtocolGame::parseOwnTrade(const InputMessagePtr& msg)

const uint8_t count = msg->getU8();
std::vector<ItemPtr> items;
items.reserve(count);

for (auto i = 0; i < count; i++) {
items[i] = getItem(msg);
items.push_back(getItem(msg));
}

g_game.processOwnTrade(name, items);
Expand All @@ -1570,9 +1572,10 @@ void ProtocolGame::parseCounterTrade(const InputMessagePtr& msg)

const uint8_t count = msg->getU8();
std::vector<ItemPtr> items;
items.reserve(count);

for (auto i = 0; i < count; i++) {
items[i] = getItem(msg);
items.push_back(getItem(msg));
}

g_game.processCounterTrade(name, items);
Expand Down Expand Up @@ -4779,6 +4782,7 @@ void ProtocolGame::parseImbuementWindow(const InputMessagePtr& msg)

const uint32_t neededItemsListCount = msg->getU32();
std::vector<ItemPtr> neededItemsList;
neededItemsList.reserve(neededItemsListCount);

for (uint32_t i = 0; i < neededItemsListCount; ++i) {
const uint16_t needItemId = msg->getU16();
Expand Down