diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-25 08:45:09 -0500 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-25 08:45:09 -0500 |
commit | 6996a9d7131cc634cb67dcd56a71ca9744001c8f (patch) | |
tree | 2858d612fbc35d7802dfae1376bc50724e95dd1e | |
parent | fe358165e3ed3656dcc501f1a585dd5eaecf9b45 (diff) |
Check for valid prevout.n in FetchInputs.
IsStandardInputs could crash if given invalid input index.
-rw-r--r-- | src/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 161a9a9139..725fabff86 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -284,6 +284,7 @@ bool CTransaction::AreInputsStandard(std::map<uint256, std::pair<CTxIndex, CTran COutPoint prevout = vin[i].prevout; assert(mapInputs.count(prevout.hash) > 0); CTransaction& txPrev = mapInputs[prevout.hash].second; + assert(prevout.n >= txPrev.vout.size()); vector<vector<unsigned char> > vSolutions; txnouttype whichType; @@ -944,6 +945,9 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes if (!txPrev.ReadFromDisk(txindex.pos)) return error("FetchInputs() : %s ReadFromDisk prev tx %s failed", GetHash().ToString().substr(0,10).c_str(), prevout.hash.ToString().substr(0,10).c_str()); } + if (prevout.n >= txPrev.vout.size() || prevout.n >= txindex.vSpent.size()) + return DoS(100, error("FetchInputs() : %s prevout.n out of range %d %d %d prev tx %s\n%s", GetHash().ToString().substr(0,10).c_str(), prevout.n, txPrev.vout.size(), txindex.vSpent.size(), prevout.hash.ToString().substr(0,10).c_str(), txPrev.ToString().c_str())); + } return true; } |