Disallow extended encoding for non-witness transactions

Github-Pull: bitcoin#14039 Rebased-From: bb530ef
ninaris · May 20, 2019 · 206f5ee · 206f5ee
1 parent 3dbc7de
commit 206f5ee
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -222,6 +222,10 @@ inline void UnserializeTransaction(TxType& tx, Stream& s) {
         for (size_t i = 0; i < tx.vin.size(); i++) {
             s >> tx.vin[i].scriptWitness.stack;
         }
+        if (!tx.HasWitness()) {
+            /* It's illegal to encode witnesses when all witness stacks are empty. */
+            throw std::ios_base::failure("Superfluous witness record");
+        }
     }
     if (flags) {
         /* Unknown flag in the serialization */