Fixes #940 : segfault when searching after merging#942
Merged
louib merged 1 commit intokeepassxreboot:developfrom Sep 20, 2017
Merged
Fixes #940 : segfault when searching after merging#942louib merged 1 commit intokeepassxreboot:developfrom
louib merged 1 commit intokeepassxreboot:developfrom
Conversation
droidmonkey
requested changes
Sep 11, 2017
Member
droidmonkey
left a comment
There was a problem hiding this comment.
Combine this with #941 and delete this PR
Member
Author
|
@droidmonkey adding the unit test here is to avoid conflicts when |
droidmonkey
approved these changes
Sep 13, 2017
0146d2b to
997645f
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Adding a unit test in
developfor #941.The bug is not in
developas we usesetGroupalready, but it's worth adding a unit test anyway.This is going to cause conflicts when upporting 2.2.1 into develop, but I think the fix can't wait for 2.3.0.
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]