Fixes #940 : segfault when searching after merging #941
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
TheZ3ro
approved these changes
Sep 11, 2017
|
Seems that travis is failing all over the place here too |
droidmonkey
approved these changes
Sep 11, 2017
|
@TheZ3ro @droidmonkey looks like the travis jobs are failing since the |
louib
force-pushed
the
fix_merge_segfault_backport
branch
2 times, most recently
from
09e2391 to
b737f06
Compare
|
@louib @droidmonkey @phoerious I don't know, |
|
The gcc tests fail as well. It has to do with asan. |
louib
force-pushed
the
fix_merge_segfault_backport
branch
3 times, most recently
from
fb4d02d to
117beb6
Compare
louib
force-pushed
the
fix_merge_segfault_backport
branch
from
117beb6 to
38350af
Compare
|
@droidmonkey @TheZ3ro sticking to the previous version of the travis image solves the problem. Seems the bug is related to the one I link to in the comment of |
droidmonkey
added a commit
that referenced
this pull request
Oct 1, 2017
- Corrected multiple snap issues [#934, #1011] - Corrected multiple custom icon issues [#708, #719, #994] - Corrected multiple Yubikey issues [#880] - Fixed single instance preventing load on occasion [#997] - Keep entry history when merging databases [#970] - Prevent data loss if passwords were mismatched [#1007] - Fixed crash after merge [#941] - Added configurable auto-type default delay [#703] - Unlock database dialog window comes to front [#663] - Translation and compiling fixes
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.
Fixes #940
How has this been tested?
Manually + added unit tests on develop
The
resolveConflictcode has changed a lot indevelop, and this bug is not ondevelop, as we already switched tosetGroupinstead ofaddEntry.Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]