Merge pull request #1926 from laanwj/2012_10_maindummybounds

Fix out-of-bounds read in main (issue #1924)
This commit is contained in:
Wladimir J. van der Laan 2012-10-25 06:12:10 -07:00
commit 1f7c5c5a3e
1 changed files with 1 additions and 4 deletions

View File

@ -3749,9 +3749,6 @@ public:
}
};
const char* pszDummy = "\0\0";
CScript scriptDummy(std::vector<unsigned char>(pszDummy, pszDummy + sizeof(pszDummy)));
CBlock* CreateNewBlock(CReserveKey& reservekey)
{
CBlockIndex* pindexPrev = pindexBest;
@ -3985,7 +3982,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
pblock->UpdateTime(pindexPrev);
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock.get());
pblock->nNonce = 0;
pblock->vtx[0].vin[0].scriptSig = scriptDummy;
pblock->vtx[0].vin[0].scriptSig = CScript() << OP_0 << OP_0;
CBlockIndex indexDummy(*pblock);
indexDummy.pprev = pindexPrev;