Changeset View
Changeset View
Standalone View
Standalone View
src/script/interpreter.cpp
| Show First 20 Lines • Show All 1,052 Lines • ▼ Show 20 Lines | try { | ||||
| // If there are more signatures left than keys left, | // If there are more signatures left than keys left, | ||||
| // then too many signatures have failed. Exit early, | // then too many signatures have failed. Exit early, | ||||
| // without checking any further signatures. | // without checking any further signatures. | ||||
| if (nSigsRemaining > nKeysRemaining) { | if (nSigsRemaining > nKeysRemaining) { | ||||
| fSuccess = false; | fSuccess = false; | ||||
| } | } | ||||
| } | } | ||||
| // Clean up stack of actual arguments | |||||
| int i = idxDummy; | |||||
| int ikey2 = idxSigCount; | |||||
| while (i-- > 1) { | |||||
| // If the operation failed, we require that all | // If the operation failed, we require that all | ||||
| // signatures must be empty vector | // signatures must be empty vector | ||||
| if (!fSuccess && (flags & SCRIPT_VERIFY_NULLFAIL) && | if (!fSuccess && (flags & SCRIPT_VERIFY_NULLFAIL)) { | ||||
| !ikey2 && stacktop(-1).size()) { | for (int i = 0; i < nSigsCount; i++) { | ||||
| if (stacktop(-idxTopSig - i).size()) { | |||||
| return set_error(serror, | return set_error(serror, | ||||
| SCRIPT_ERR_SIG_NULLFAIL); | SCRIPT_ERR_SIG_NULLFAIL); | ||||
| } | } | ||||
| if (ikey2 > 0) { | |||||
| ikey2--; | |||||
| } | } | ||||
| popstack(stack); | |||||
| } | } | ||||
| // A bug causes CHECKMULTISIG to consume one extra | // A bug causes CHECKMULTISIG to consume one extra | ||||
| // argument whose contents were not checked in any way. | // argument whose contents were not checked in any way. | ||||
| // | // | ||||
| // Unfortunately this is a potential source of | // Unfortunately this is a potential source of | ||||
| // mutability, so optionally verify it is exactly equal | // mutability, so optionally verify it is exactly equal | ||||
| // to zero prior to removing it from the stack. | // to zero prior to removing it from the stack. | ||||
| if ((flags & SCRIPT_VERIFY_NULLDUMMY) && | if ((flags & SCRIPT_VERIFY_NULLDUMMY) && | ||||
| stacktop(-1).size()) { | stacktop(-idxDummy).size()) { | ||||
| return set_error(serror, SCRIPT_ERR_SIG_NULLDUMMY); | return set_error(serror, SCRIPT_ERR_SIG_NULLDUMMY); | ||||
| } | } | ||||
deadalnix: That guy should probably be moved up front. You wouldn't have to modify it here if you do it… | |||||
| // Clean up stack of arguments | |||||
| for (int i = 0; i < idxDummy; i++) { | |||||
| popstack(stack); | popstack(stack); | ||||
| } | |||||
| stack.push_back(fSuccess ? vchTrue : vchFalse); | stack.push_back(fSuccess ? vchTrue : vchFalse); | ||||
| if (opcode == OP_CHECKMULTISIGVERIFY) { | if (opcode == OP_CHECKMULTISIGVERIFY) { | ||||
| if (fSuccess) { | if (fSuccess) { | ||||
| popstack(stack); | popstack(stack); | ||||
| } else { | } else { | ||||
| return set_error( | return set_error( | ||||
| serror, SCRIPT_ERR_CHECKMULTISIGVERIFY); | serror, SCRIPT_ERR_CHECKMULTISIGVERIFY); | ||||
| ▲ Show 20 Lines • Show All 580 Lines • Show Last 20 Lines | |||||
That guy should probably be moved up front. You wouldn't have to modify it here if you do it first.