8000 diff_file: Fix crash when freeing a patch representing an empty untracked file by jorio · Pull Request #6475 · libgit2/libgit2 · GitHub
[go: up one dir, main page]
Skip to content

diff_file: Fix crash when freeing a patch representing an empty untracked file #6475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2023
Merged

diff_file: Fix crash when freeing a patch representing an empty untracked file #6475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/libgit2/diff_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,13 @@ static int diff_file_content_load_workdir_file(
goto cleanup;
}

/* if file is empty, don't attempt to mmap or readbuffer */
if (fc->file->size == 0) {
fc->map.len = 0;
fc->map.data = git_str__initstr;
goto cleanup;
}

if ((diff_opts->flags & GIT_DIFF_SHOW_BINARY) == 0 &&
diff_file_content_binary_by_size(fc))
goto cleanup;
Expand Down
36 changes: 36 additions & 0 deletions tests/libgit2/diff/workdir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,42 @@ void test_diff_workdir__checks_options_version(void)
cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
}

void test_diff_workdir__can_diff_empty_untracked_file(void)
{
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_diff *diff = NULL;
git_patch *patch = NULL;

g_repo = cl_git_sandbox_init("empty_standard_repo");

cl_git_mkfile("empty_standard_repo/emptyfile.txt", "");

opts.context_lines = 3;
opts.interhunk_lines = 1;
opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_SHOW_UNTRACKED_CONTENT;

cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts));

/* without filters */
git_patch_from_diff(&patch, diff, 0);
cl_assert(NULL != patch);
cl_assert(0 == git_patch_get_delta(patch)->new_file.size);
cl_assert(0 == strcmp("emptyfile.txt", git_patch_get_delta(patch)->new_file.path));
git_patch_free(patch);
patch = NULL;

/* with a filter */
cl_repo_set_bool(g_repo, "core.autocrlf", true); /* install some filter */
git_patch_from_diff(&patch, diff, 0);
cl_assert(NULL != patch);
cl_assert(0 == git_patch_get_delta(patch)->new_file.size);
cl_assert(0 == strcmp("emptyfile.txt", git_patch_get_delta(patch)->new_file.path));
git_patch_free(patch);
patch = NULL;

git_diff_free(diff);
}

void test_diff_workdir__can_diff_empty_file(void)
{
git_diff *diff;
Expand Down
0