aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2012-10-25 06:12:10 -0700
committerWladimir J. van der Laan <[email protected]>2012-10-25 06:12:10 -0700
commit1f7c5c5a3ec8c06862835f30caffdac0466ca22f (patch)
tree9ae522f85e45908f540a393a61b65cf6b4e0c15b /src/main.cpp
parentMerge pull request #1956 from laanwj/2012_10_prerelease_warning (diff)
parentFix out-of-bounds read noticed by Ricardo Correia (diff)
downloaddiscoin-1f7c5c5a3ec8c06862835f30caffdac0466ca22f.tar.xz
discoin-1f7c5c5a3ec8c06862835f30caffdac0466ca22f.zip
Merge pull request #1926 from laanwj/2012_10_maindummybounds
Fix out-of-bounds read in main (issue #1924)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 2109a1df1..523b3e06e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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;