diff options
| author | Pieter Wuille <[email protected]> | 2013-08-25 07:42:21 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-08-25 07:42:21 -0700 |
| commit | 8a9e538227b077b05c93bfec8e5ce1cca0bb366a (patch) | |
| tree | bb295bf9087686d2389602a299b7829fecce6067 /src/main.cpp | |
| parent | Merge pull request #2618 from fcicq/solaris-support (diff) | |
| parent | Fix out-of-bounds check (diff) | |
| download | discoin-8a9e538227b077b05c93bfec8e5ce1cca0bb366a.tar.xz discoin-8a9e538227b077b05c93bfec8e5ce1cca0bb366a.zip | |
Merge pull request #2935 from sipa/obounds
Fix out-of-bounds check
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index bef578a80..24fd1fadb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2443,7 +2443,8 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp) (TestNet() && CBlockIndex::IsSuperMajority(2, pindexPrev, 51, 100))) { CScript expect = CScript() << nHeight; - if (!std::equal(expect.begin(), expect.end(), block.vtx[0].vin[0].scriptSig.begin())) + if (block.vtx[0].vin[0].scriptSig.size() < expect.size() || + !std::equal(expect.begin(), expect.end(), block.vtx[0].vin[0].scriptSig.begin())) return state.DoS(100, error("AcceptBlock() : block height mismatch in coinbase")); } } |