Fix unsoundness in git2::MergeFileResult::content() for empty content#1282
Merged
Conversation
When a `MergeFileResult` is created with no actual file content (e.g. via `git2::merge_file()`), the content is empty and the pointer to it is NULL; this violates the preconditions of `slice::from_raw_parts()`, which requires that the provided pointer be non-null. The new test is currently failing and exists to show the error - it could not be marked with `#[should_panic]`, which does not appear to work here. This may be because the error message is that "thread caused non-unwinding panic. aborting." after the problematic `slice::from_raw_parts()` call, and the attribute only works with unwinding panics, I'm not sure. There is already an existing test for confirming that `MergeFileResult::content()` works properly with non-empty content.
When there is no data, rather than using `slice::from_raw_parts()` with a null pointer (which is unsound), just return an empty slice directly. Fixes rust-lang#1281
DanielEScherzer
force-pushed
the
empty-merge-content
branch
from
ab06f61 to
262be4b
Compare
ehuss
approved these changes
Jun 20, 2026
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
3 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.
Fixes #1281