Fixes #1762 segfault when miner is interrupted. #1778
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bitcartel
added
C-bug
|
Performed testing of this PR on mainnet by running zcashd in gdb with and without the patch, using zcash-cli to enable and disable the miner, and then wait for a new block to arrive and either crash (without patch) or continue as normal (with patch). |
str4d
reviewed
Nov 4, 2016
| @@ -648,12 +648,10 @@ void static BitcoinMiner(CWallet *pwallet) | |||
| catch (const boost::thread_interrupted&) | |||
| { | |||
| LogPrintf("ZcashMiner terminated\n"); | |||
| throw; | |||
There was a problem hiding this comment.
AIUI this is technically wrong; Boost requires that you re-throw boost::thread_interrupted so that higher-level code can catch it.
Running ./zcash-cli setgenerate false would result in a segfault. The miner thread's boost::signals2::connection was not disconnected when the miner thread was interrupted and shutdown. Subsequently, when a new block arrived, the UpdateTip callback would still be invoked on a now invalid object, resulting in a segfault.
bitcartel
force-pushed
the
1762_segfault_miner
branch
from
fd9ade8
to
5e9b555
Compare
bitcartel
added
the
S-waiting-on-review
|
utACK |
1 similar comment
|
utACK |
str4d
removed
the
S-waiting-on-review
|
@zkbot r+ |
|
📌 Commit 5e9b555 has been approved by |
|
☀️ Test successful - zcash |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1762