Merge 753e63cd96 into 10bfffe033

src/base/tools/cryptonote/BlockTemplate.cpp

@@ -198,7 +198,7 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     }
 
     if (m_coin == Coin::ZEPHYR) {
-        uint8_t pricing_record[120];
+        uint8_t pricing_record[24];
         ar(pricing_record);
     }
 
@@ -225,12 +225,8 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     ar(m_height);
     ar(m_numOutputs);
 
-    if (m_coin == Coin::ZEPHYR) {
+    const uint64_t expected_outputs = (m_coin == Coin::ZEPHYR) ? 2 : 1;
-        if (m_numOutputs < 2) {
+    if (m_numOutputs != expected_outputs) {
-            return false;
-        }
-    }
-    else if (m_numOutputs != 1) {
         return false;
     }
 
@@ -256,7 +252,6 @@ bool xmrig::BlockTemplate::parse(bool hashes)
         ar.skip(asset_type_len);
         ar(m_viewTag);
 
-        for (uint64_t k = 1; k < m_numOutputs; ++k) {
         uint64_t amount2;
         ar(amount2);
 
@@ -275,7 +270,6 @@ bool xmrig::BlockTemplate::parse(bool hashes)
         uint8_t view_tag2;
         ar(view_tag2);
     }
-    }
     else if (m_outputType == 3) {
         ar(m_viewTag);
     }