Fix potential null dereferences

meshcollider · meshcollider · commit c0019924406e · 2017-08-23T19:47:56.000+12:00
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -145,6 +145,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
     LOCK2(cs_main, mempool.cs);
     CBlockIndex* pindexPrev = chainActive.Tip();
+    assert(pindexPrev != nullptr);
     nHeight = pindexPrev->nHeight + 1;
 
     pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus());
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -281,6 +281,7 @@ void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) {
     fUpdateConnectionTime = false;
     LOCK(cs_main);
     CNodeState *state = State(nodeid);
+    assert(state != nullptr);
 
     if (state->fSyncStarted)
         nSyncStarted--;
@@ -315,6 +316,7 @@ bool MarkBlockAsReceived(const uint256& hash) {
     std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash);
     if (itInFlight != mapBlocksInFlight.end()) {
         CNodeState *state = State(itInFlight->second.first);
+        assert(state != nullptr);
         state->nBlocksInFlightValidHeaders -= itInFlight->second.second->fValidatedHeaders;
         if (state->nBlocksInFlightValidHeaders == 0 && itInFlight->second.second->fValidatedHeaders) {
             // Last validated block on the queue was received.
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -812,6 +812,7 @@ static void ApplyStats(CCoinsStats &stats, CHashWriter& ss, const uint256& hash,
 static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats)
 {
     std::unique_ptr<CCoinsViewCursor> pcursor(view->Cursor());
+    assert(pcursor);
 
     CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
     stats.hashBlock = pcursor->GetBestBlock();
@@ -1514,6 +1515,8 @@ UniValue getchaintxstats(const JSONRPCRequest& request)
             pindex = chainActive.Tip();
         }
     }
+    
+    assert(pindex != nullptr);
 
     if (blockcount < 1 || blockcount >= pindex->nHeight) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid block count: should be between 1 and the block's height");
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -251,6 +251,8 @@ bool CheckSequenceLocks(const CTransaction &tx, int flags, LockPoints* lp, bool
     AssertLockHeld(mempool.cs);
 
     CBlockIndex* tip = chainActive.Tip();
+    assert(tip != nullptr);
+    
     CBlockIndex index;
     index.pprev = tip;
     // CheckSequenceLocks() uses chainActive.Height()+1 to evaluate

Original file line number	Diff line number	Diff line change
`@@ -812,6 +812,7 @@ static void ApplyStats(CCoinsStats &stats, CHashWriter& ss, const uint256& hash,`
`812`	`812`	`static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats)`
`813`	`813`	`{`
`814`	`814`	`std::unique_ptr<CCoinsViewCursor> pcursor(view->Cursor());`
	`815`	`+ assert(pcursor);`
`815`	`816`
`816`	`817`	`CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);`
`817`	`818`	`stats.hashBlock = pcursor->GetBestBlock();`
`@@ -1514,6 +1515,8 @@ UniValue getchaintxstats(const JSONRPCRequest& request)`
`1514`	`1515`	`pindex = chainActive.Tip();`
`1515`	`1516`	`}`
`1516`	`1517`	`}`
	`1518`	`+`
	`1519`	`+ assert(pindex != nullptr);`
`1517`	`1520`
`1518`	`1521`	`if (blockcount < 1 \|\| blockcount >= pindex->nHeight) {`
`1519`	`1522`	`throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid block count: should be between 1 and the block's height");`