Both pcointTip and pblocktree can be null, but since CBlockTree::Flush is empty the call is optimized away and so the second check is not strictly necessary...
Check for null pointers in Shutdown (issue #1950) #1952
pull tucenaber wants to merge 4 commits into bitcoin:master from tucenaber:master changing 1 files +4 −2-
tucenaber commented at 8:56 PM on October 23, 2012: contributor
-
Added checks for null pointers in Shutdown f057fcfcfb
-
sipa commented at 10:05 PM on October 23, 2012: member
The braces aren't necessary, but nice catch. ACK on the change.
-
tucenaber commented at 10:36 PM on October 23, 2012: contributor
Wasn't sure about the coding style ;)
-
Estetics ee75831030
-
Diapolo commented at 5:50 AM on October 24, 2012: none
Can you please squash the both commits into one :).
- git rebase origin -i
- add squash in front of the second commit
-
laanwj commented at 6:21 AM on October 24, 2012: member
ACK after squashing to one commit
-
cde4b112e4
Added checks for null pointers in Shutdown
Estetics
-
Merge branch 'master' of git://github.com/tucenaber/bitcoin 99f9a11fc6
-
tucenaber commented at 11:48 AM on October 24, 2012: contributor
Diapolo: I did the rebase thing and git forced me to merge and now there are 4 commits... Should I just create a new pull request?
Edit: never mind I get it now
-
Diapolo commented at 12:37 PM on October 24, 2012: none
It's best to fetch upstream changes (current master
git fetch upstream), rebase to upstream (git rebase upstream) and afterwards rebase origin and squash your commits. You can kick unwanted commits out by simply removing their line while doinggit rebase origin -i. -
sipa commented at 6:50 PM on October 25, 2012: member
Cherry picked cde4b11 as 3026baaa7c3.
- sipa closed this on Oct 25, 2012
- KolbyML referenced this in commit c7f7b009b7 on Dec 5, 2020
- KolbyML referenced this in commit eaac8fe2e7 on Dec 5, 2020
- DrahtBot locked this on Sep 8, 2021
