Merge 1ccb0b6 into merged_master (Elements PR ElementsProject#610)

apoelstra · Nov 6, 2020 · 264b90e · 264b90e
2 parents 93e6b5f + 1ccb0b6
commit 264b90e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/primitives/pak.cpp b/src/primitives/pak.cpp
@@ -185,7 +185,7 @@ bool ScriptHasValidPAKProof(const CScript& script, const uint256& genesis_hash)
     std::vector<unsigned char> extracted_pubkey_hash;
 
     // Get full pubkey
-    if (!script.GetOp(pc, opcode, data) || opcode != 33 || data.size() != 33) {
+    if (!script.GetOp(pc, opcode, data) || data.size() != 33 || opcode > OP_PUSHDATA4) {
         return false;
     }
     CPubKey full_pubkey(data.begin(), data.end());

diff --git a/src/script/script.cpp b/src/script/script.cpp
@@ -213,17 +213,24 @@ bool CScript::IsPegoutScript(uint256& genesis_hash, CScript& pegout_scriptpubkey
         return false;
     }
 
-    if (!GetOp(pc, opcode, data) || data.size() != 32 ) {
+    if (!GetOp(pc, opcode, data) || data.size() != 32 || opcode > OP_PUSHDATA4) {
         return false;
     }
     genesis_hash = uint256(data);
 
     // Read in parent chain destination scriptpubkey
-    if (!GetOp(pc, opcode, data) || data.size() == 0 ) {
+    if (!GetOp(pc, opcode, data) || opcode > OP_PUSHDATA4 ) {
         return false;
     }
     pegout_scriptpubkey = CScript(data.begin(), data.end());
 
+    // All extra opcodes must be pushes
+    while(GetOp(pc, opcode, data)) {
+        if (opcode > OP_PUSHDATA4) {
+            return false;
+        }
+    }
+
     return true;
 }