Fixes UB reported in issue bitcoin#19278

rajarshimaitra · Jun 25, 2020 · 8cc8548 · 8cc8548
1 parent 39bd9dd
commit 8cc8548
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -5055,11 +5055,11 @@ bool LoadMempool(CTxMemPool& pool)
             file >> nFeeDelta;
 
             CAmount amountdelta = nFeeDelta;
-            if (amountdelta) {
+            if (amountdelta && MoneyRange(amountdelta)) {
                 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 */, 0 /* nAbsurdFee */,
@@ -5087,7 +5087,9 @@ bool LoadMempool(CTxMemPool& pool)
         file >> mapDeltas;
 
         for (const auto& i : mapDeltas) {
-            pool.PrioritiseTransaction(i.first, i.second);
+            if(MoneyRange(i.second)){
+                pool.PrioritiseTransaction(i.first, i.second);
+            }
         }
 
         // TODO: remove this try except in v0.22