[wallet] [moveonly] Check non-null pindex before potentially referencing #10265

pull kallewoof wants to merge 1 commits into bitcoin:master from kallewoof:fix-check-pindex-scanforwallettx changing 1 files +4 −4

kallewoof commented at 11:50 PM on April 23, 2017: member

The once-a-minute LogPrintf in ScanForWalletTransactions will do a null-ref if it happens to hit the 60s mark right at the last block (where pindex becomes null). This was moved up to the top of the block instead, where the while (pindex && !fAbortRescan) has checked pindex for us.
fanquake added the label Wallet on Apr 23, 2017
jonasschnelli commented at 6:14 AM on April 24, 2017: contributor

Nice catch! utACK 6b816dc56b73025ca8fcb8b2a1e1dab8d18b4fd0
NicolasDorier commented at 7:10 AM on April 24, 2017: contributor

utACK 6b816dc56b73025ca8fcb8b2a1e1dab8d18b4fd0. I am surprised there were no more bug report about that.
mchrostowski commented at 6:57 AM on April 25, 2017: contributor

@kallewoof I would go with temptation and move the GetTime() >= nNow check to line 1554 as it is vaguely related to ShowProgress, this could help with readability too.
kallewoof commented at 7:10 AM on April 25, 2017: member

@mchrostowski Did you mean 1545 by any chance?
paveljanik commented at 7:14 AM on April 25, 2017: contributor

Concept ACK @kallewoof Agree with the move to the top of the block.
[wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call. c36ea693ee
kallewoof force-pushed on Apr 25, 2017
kallewoof commented at 7:20 AM on April 25, 2017: member

This PR is now a MOVEONLY. 4 lines moved up to L1547-1550 from L1560-1563.
kallewoof renamed this:
~~[wallet] Check non-null pindex before potentially referencing~~
[wallet] [moveonly] Check non-null pindex before potentially referencing
on Apr 25, 2017
laanwj commented at 2:04 PM on April 25, 2017: member

utACK c36ea69
laanwj merged this on Apr 25, 2017
laanwj closed this on Apr 25, 2017
laanwj referenced this in commit c29a0d4812 on Apr 25, 2017
kallewoof deleted the branch on Apr 25, 2017
luke-jr referenced this in commit 211783512d on Jun 3, 2017
luke-jr referenced this in commit 19c0de4670 on Jun 3, 2017
luke-jr referenced this in commit 9697b48160 on Jun 3, 2017
luke-jr referenced this in commit df465ba435 on Jun 5, 2017
luke-jr referenced this in commit ac02502288 on Jun 5, 2017
luke-jr referenced this in commit ff13f592c5 on Jun 5, 2017
nomnombtc referenced this in commit 506bdbdfa9 on Jul 17, 2017
codablock referenced this in commit e2225f37c2 on Jan 26, 2018
andvgal referenced this in commit 0ed8f87464 on Jan 6, 2019
CryptoCentric referenced this in commit 0c2579e067 on Feb 27, 2019
DrahtBot locked this on Dec 16, 2021

Contributors

Labels