Fix segmentation fault in the FSMonitor v2 series #3241
Merged
Conversation
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
If there is no current token, we should not segfault. Such a situation can arise e.g. in an auto-stashing rebase, after the autostash was applied. Signed-off-by: Johannes Schindelin <[email protected]>
derrickstolee
approved these changes
May 28, 2021
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.
After upgrading to v2.32.0-rc2, I just ran
git rebase --autostash -i HEAD~2and ran into a segmentation fault. Running this in the debugger reveals that v2 of the FSMonitor series introduced astrlen(since_token), butsince_tokencan beNULL.It might look like an error to pass
NULLhere, but it is not becausewrite_packetized_from_buf_no_flush()does not even attempt to look at that pointer if the number of remaining bytes to write is 0.