BUG: Guard access to tx.sapData in connectBlock

random-zebra · Fuzzbawls · commit 43f7ca7024e5 · 2020-12-18T21:35:02.000-08:00
Github-Pull: #2064 Rebased-From: f62ac6c
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1670,8 +1670,10 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         UpdateCoins(tx, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight);
 
         // Sapling update tree
-        for(const OutputDescription &outputDescription : tx.sapData->vShieldedOutput) {
-            sapling_tree.append(outputDescription.cmu);
+        if (tx.IsShieldedTx() && !tx.sapData->vShieldedOutput.empty()) {
+            for(const OutputDescription &outputDescription : tx.sapData->vShieldedOutput) {
+                sapling_tree.append(outputDescription.cmu);
+            }
         }
 
         vPos.emplace_back(tx.GetHash(), pos);
