New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for incorrect locking in GetPubKey() (keystore.cpp) #7913

Merged
merged 1 commit into from Apr 21, 2016

Conversation

Projects
None yet
7 participants
@mrwhythat
Contributor

mrwhythat commented Apr 19, 2016

Fix for issue #7901

@sipa

View changes

Show outdated Hide outdated src/keystore.cpp
@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Apr 20, 2016

Member

utACK, but fix the indendation

Member

sipa commented Apr 20, 2016

utACK, but fix the indendation

@mrwhythat

This comment has been minimized.

Show comment
Hide comment
@mrwhythat

mrwhythat Apr 20, 2016

Contributor

Oh, yes, sorry. I thought I had no-tabs mode for C++ in Emacs.

Contributor

mrwhythat commented Apr 20, 2016

Oh, yes, sorry. I thought I had no-tabs mode for C++ in Emacs.

@laanwj laanwj added the Wallet label Apr 20, 2016

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Apr 20, 2016

Member

@yurizhykin Mind to squash the commits?

Member

MarcoFalke commented Apr 20, 2016

@yurizhykin Mind to squash the commits?

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Apr 20, 2016

Member

utACK (but please squash commits)

Member

jonasschnelli commented Apr 20, 2016

utACK (but please squash commits)

@mrwhythat

This comment has been minimized.

Show comment
Hide comment
@mrwhythat

mrwhythat Apr 20, 2016

Contributor

Yep, squashed.

Contributor

mrwhythat commented Apr 20, 2016

Yep, squashed.

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Apr 20, 2016

Contributor

ACK 220f950

Contributor

paveljanik commented Apr 20, 2016

ACK 220f950

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli
Member

jonasschnelli commented Apr 20, 2016

ACK 220f950

@dcousens

This comment has been minimized.

Show comment
Hide comment
@dcousens

dcousens Apr 21, 2016

Contributor

utACK 220f950

Contributor

dcousens commented Apr 21, 2016

utACK 220f950

@sipa sipa merged commit 220f950 into bitcoin:master Apr 21, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

sipa added a commit that referenced this pull request Apr 21, 2016

Merge #7913: Fix for incorrect locking in GetPubKey() (keystore.cpp)
220f950 Fix for incorrect locking in GetPubKey() (keystore.cpp) (Yuri Zhykin)

@mrwhythat mrwhythat deleted the mrwhythat:getpubkey-locking-fix branch May 30, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment