This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
~/projects/bitcoin/bitcoin (pr/16202)$ git diff | |
diff --git a/src/net.cpp b/src/net.cpp | |
index d5e74d928f..d7371d80df 100644 | |
--- a/src/net.cpp | |
+++ b/src/net.cpp | |
@@ -596,6 +596,9 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete | |
if (i == mapRecvBytesPerMsgCmd.end()) | |
i = mapRecvBytesPerMsgCmd.find(NET_MESSAGE_COMMAND_OTHER); | |
assert(i != mapRecvBytesPerMsgCmd.end()); | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/src/script/interpreter.cpp | |
+++ b/src/script/interpreter.cpp | |
@@ -504,6 +504,14 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& | |
return set_error(serror, SCRIPT_ERR_MINIMALDATA); | |
} | |
stack.push_back(vchPushValue); | |
+ if ((flags & SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS) && opcode == OP_FALSE) { | |
+ auto pc_tmp = pc; | |
+ opcodetype next_opcode; | |
+ valtype dummy_data; |
OlderNewer