diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-27 10:15:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-27 10:16:54 +0100 |
| commit | ca1913e8f64fc245157b008d6b37160306aa1d83 (patch) | |
| tree | 65d4289e4ab9aac220e22a0f20ac501f6dbf47fb /src/miner.cpp | |
| parent | b571a8c7086043df0b16a10fe7953495607d3d5a (diff) | |
| parent | 665bdd3bc9ba4ac566edf5ba3fa8bbd93eb4780f (diff) | |
| download | bitcoin-ca1913e8f64fc245157b008d6b37160306aa1d83.tar.xz | |
Merge pull request #2342
665bdd3 Fix off-by-one errors in use of IsFinalTx() (Peter Todd)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index ca3b65a11a..f9dab4bd67 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -158,7 +158,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) mi != mempool.mapTx.end(); ++mi) { const CTransaction& tx = mi->second.GetTx(); - if (tx.IsCoinBase() || !IsFinalTx(tx)) + if (tx.IsCoinBase() || !IsFinalTx(tx, pindexPrev->nHeight + 1)) continue; COrphan* porphan = NULL; |