jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Addresses crash scenario where too many cards were being loaded in a game.

Browse source 
- Too many iterations that fill up the server's memory trying to (1) render the deck hash and (2) building up a string of the deck contents
This commit is contained in:
ZeldaZach 2024-04-28 22:14:24 -04:00
parent 0e97cc1712
commit eb712d25dc
4 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/decklist.cpp
View file

@ -804,13 +804,18 @@ void DeckList::updateDeckHash()
hashZones << DECK_ZONE_MAIN << DECK_ZONE_SIDE; // Zones in deck to be included in hashing process
optionalZones << DECK_ZONE_TOKENS; // Optional zones in deck not included in hashing process
for (int i = 0; i < root->size(); i++) {
auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
unsigned int cardsHashedAlready = 0;
for (auto innerDecklistNode : *root) {
auto *node = dynamic_cast<InnerDecklistNode *>(innerDecklistNode);
for (int j = 0; j < node->size(); j++) {
if (hashZones.contains(node->getName())) // Mainboard or Sideboard
{
auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
for (int k = 0; k < card->getNumber(); ++k) {
if (++cardsHashedAlready >= MAX_CARDS_TO_HASH) {
cardList.clear();
break; // We can't efficiently calculate a hash with a larger number
}
cardList.append((node->getName() == DECK_ZONE_SIDE ? "SB:" : "") + card->getName().toLower());
}
}