Avoid signed integer overflow when loading a mempool.dat file with a malformed time field

practicalswift · practicalswift · commit ee11a412a537 · 2020-11-11T14:45:16.000Z
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -5084,7 +5084,7 @@ bool LoadMempool(CTxMemPool& pool)
                 pool.PrioritiseTransaction(tx->GetHash(), amountdelta);
             }
             TxValidationState state;
-            if (nTime + nExpiryTimeout > nNow) {
+            if (nTime > nNow - nExpiryTimeout) {
                 LOCK(cs_main);
                 AcceptToMemoryPoolWithTime(chainparams, pool, state, tx, nTime,
                                            nullptr /* plTxnReplaced */, false /* bypass_limits */,

Original file line number	Diff line number	Diff line change
`@@ -5084,7 +5084,7 @@ bool LoadMempool(CTxMemPool& pool)`
`5084`	`5084`	`pool.PrioritiseTransaction(tx->GetHash(), amountdelta);`
`5085`	`5085`	`}`
`5086`	`5086`	`TxValidationState state;`
`5087`		`- if (nTime + nExpiryTimeout > nNow) {`
	`5087`	`+ if (nTime > nNow - nExpiryTimeout) {`
`5088`	`5088`	`LOCK(cs_main);`
`5089`	`5089`	`AcceptToMemoryPoolWithTime(chainparams, pool, state, tx, nTime,`
`5090`	`5090`	`nullptr /* plTxnReplaced /, false / bypass_limits */,`