Merge c65c77c into merged_master (Bitcoin PR #14039)

8paa · Oct 28, 2020 · bbb4535 · bbb4535
2 parents 18ec2e5 + c65c77c
commit bbb4535
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -387,6 +387,11 @@ inline void UnserializeTransaction(TxType& tx, Stream& s) {
                     s >> tx.witness.vtxinwit[i].m_pegin_witness.stack;
                 }
             }
+
+            if (!tx.HasWitness()) {
+                /* It's illegal to encode witnesses when all witness stacks are empty. */
+                throw std::ios_base::failure("Superfluous witness record");
+            }
         }
         s >> tx.nLockTime;
     }