Prepare a PR for https://github.com/arrbee/diff-match-patch-c/issues/5#6
Open
udif wants to merge 1 commit intoarrbee:masterfrom
Open
Prepare a PR for https://github.com/arrbee/diff-match-patch-c/issues/5#6udif wants to merge 1 commit intoarrbee:masterfrom
udif wants to merge 1 commit intoarrbee:masterfrom
Conversation
|
Thanks! |
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
2 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.
OK, Here is a fix for the problem :-)
The problem was caused by the first loop in diff_cleanup_merge().
'i' was used as the position for the current element, and updated to node->next at the end of each loop iteration.
HOWEVER, some of the loop iterations have unallocated the current node pointed by 'i', effectively setting its 'next' element to point to the free store, thereby corrupting 'i'.
The solution was to calculate the next 'i' and saving it at the beginning of the loop iteration.