Skip to content

Fixes #940 : segfault when searching after merging#941

Merged
TheZ3ro merged 2 commits intokeepassxreboot:release/2.2.1from
louib:fix_merge_segfault_backport
Sep 15, 2017
Merged

Fixes #940 : segfault when searching after merging#941
TheZ3ro merged 2 commits intokeepassxreboot:release/2.2.1from
louib:fix_merge_segfault_backport

Conversation

@louib
Copy link
Copy Markdown
Member

@louib louib commented Sep 11, 2017

Fixes #940

How has this been tested?

Manually + added unit tests on develop

The resolveConflict code has changed a lot in develop, and this bug is not on develop, as we already switched to setGroup instead of addEntry.

Types of changes

  • ✅ Bug fix (non-breaking change which fixes an issue)

Checklist:

  • ✅ I have read the CONTRIBUTING document. [REQUIRED]
  • ✅ My code follows the code style of this project. [REQUIRED]
  • ✅ All new and existing tests passed. [REQUIRED]
  • ✅ I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]
  • ✅ I have added tests to cover my changes.

@louib louib mentioned this pull request Sep 11, 2017
Merged
@TheZ3ro
Copy link
Copy Markdown
Contributor

TheZ3ro commented Sep 11, 2017

Seems that travis is failing all over the place here too

@louib
Copy link
Copy Markdown
Member Author

louib commented Sep 14, 2017

@TheZ3ro @droidmonkey looks like the travis jobs are failing since the clang version went from 3.5.0 to 3.9.0 .

@louib louib force-pushed the fix_merge_segfault_backport branch 2 times, most recently from 09e2391 to b737f06 Compare September 14, 2017 14:19
@louib louib added this to the v2.2.1 milestone Sep 14, 2017
@TheZ3ro
Copy link
Copy Markdown
Contributor

TheZ3ro commented Sep 14, 2017

@louib @droidmonkey @phoerious I don't know, gcc is failing as well. This needs to be fixed ASAP since we "can't" approve PRs if travis keeps failing.

@droidmonkey
Copy link
Copy Markdown
Member

droidmonkey commented Sep 14, 2017

The gcc tests fail as well. It has to do with asan.

@louib louib force-pushed the fix_merge_segfault_backport branch 3 times, most recently from fb4d02d to 117beb6 Compare September 15, 2017 15:28
@louib louib force-pushed the fix_merge_segfault_backport branch from 117beb6 to 38350af Compare September 15, 2017 15:43
@louib
Copy link
Copy Markdown
Member Author

louib commented Sep 15, 2017

@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 .travis.yml

@TheZ3ro TheZ3ro merged commit 422bc4d into keepassxreboot:release/2.2.1 Sep 15, 2017
@louib louib deleted the fix_merge_segfault_backport branch September 15, 2017 20:44
droidmonkey added a commit that referenced this pull request Oct 1, 2017
@droidmonkey
Release 2.2.1
2bce9c8 
- 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

Reviewers

@droidmonkey droidmonkey droidmonkey approved these changes

@phoerious phoerious Awaiting requested review from phoerious

+1 more reviewer

@TheZ3ro TheZ3ro TheZ3ro approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.2.1

Development

Successfully merging this pull request may close these issues.

3 participants

@louib @TheZ3ro @droidmonkey