flipdiff: avoid crash on non-commuting patches#180
Open
SAY-5 wants to merge 1 commit into
Open
Conversation
Signed-off-by: Sai Asish Y <say.apm35@gmail.com>
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
1 participant
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.
Pull Request Guidelines
This is a bug fix, so it targets the
0.4.xbranch.Description
flipdiffsegfaults when the two patches don't commute, for example on patches produced bygit diff. While undoing patch1 from the reconstructed file,remove_line()is asked to remove a line that is no longer present (patch2 already changed it). In that casekillstays NULL and the function dereferences it. This guards the NULL case and returns early, since there is nothing to remove. Fixes #178.Type of Change
Bug fix (targets 0.4.x)
Testing
Added
tests/flip20, which feeds the non-commuting input from the issue toflipdiffand checks it exits successfully instead of crashing.