From 25256abe0214c09c682109a26fb6d7408efae5f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Fri, 18 Sep 2026 22:08:13 +0200
Subject: [PATCH] [DeckList] Extract card parsing from zone XML reader

---
 .../deck_list/tree/inner_deck_list_node.cpp   | 21 ++++++++++++-------
 .../deck_list/tree/inner_deck_list_node.h     | 12 +++++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
index 510a710cd..bc91a6ab5 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp
@@ -151,24 +151,29 @@ bool InnerDecklistNode::compareName(AbstractDecklistNode *other) const
     }
 }
 
+int InnerDecklistNode::readCardElement(QXmlStreamReader *xml, int remainingBudget)
+{
+    const int amount = qMin(xml->attributes().value("number").toString().toInt(), remainingBudget);
+    new DecklistCardNode(xml->attributes().value("name").toString(), amount, this, -1,
+                         xml->attributes().value("setShortName").toString(),
+                         xml->attributes().value("collectorNumber").toString(),
+                         xml->attributes().value("uuid").toString());
+    return amount;
+}
+
 int InnerDecklistNode::readElement(QXmlStreamReader *xml, int limit)
 {
     int totalCards = 0;
     while (!xml->atEnd()) {
         xml->readNext();
         const QString childName = xml->name().toString();
+        const int remainingBudget = limit - totalCards;
         if (xml->isStartElement()) {
             if (childName == "zone") {
                 auto *newZone = new InnerDecklistNode(xml->attributes().value("name").toString(), this);
-                totalCards += newZone->readElement(xml, limit - totalCards);
+                totalCards += newZone->readElement(xml, remainingBudget);
             } else if (childName == "card") {
-                int amount = xml->attributes().value("number").toString().toInt();
-                amount = qMin(amount, limit - totalCards);
-                new DecklistCardNode(xml->attributes().value("name").toString(), amount, this, -1,
-                                     xml->attributes().value("setShortName").toString(),
-                                     xml->attributes().value("collectorNumber").toString(),
-                                     xml->attributes().value("uuid").toString());
-                totalCards += amount;
+                totalCards += readCardElement(xml, remainingBudget);
             }
         } else if (xml->isEndElement() && (childName == "zone")) {
             return totalCards;
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
index 958229883..9e0460915 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h
@@ -236,6 +236,18 @@ public:
      * @param xml Writer to append elements to.
      */
     void writeElement(QXmlStreamWriter *xml) override;
+
+private:
+    /**
+     * @brief Reads a single `card` element and appends it to this node.
+     *
+     * The card's quantity is capped at @p remainingBudget so a malicious or
+     * oversized deck file cannot push the total card count past the deck size
+     * limit.
+     *
+     * @return The amount of cards actually added.
+     */
+    int readCardElement(QXmlStreamReader *xml, int remainingBudget);
 };
 
 #endif // COCKATRICE_INNER_DECK_LIST_NODE_H