diff options
| -rw-r--r-- | src/patch_parse.c | 6 | ||||
| -rw-r--r-- | tests/patch/parse.c | 20 |
2 files changed, 25 insertions, 1 deletions
diff --git a/src/patch_parse.c b/src/patch_parse.c index b44d4f02f..5e5e5d941 100644 --- a/src/patch_parse.c +++ b/src/patch_parse.c @@ -588,8 +588,8 @@ static int parse_hunk_body( memset(line, 0x0, sizeof(git_diff_line)); - line->content = ctx->parse_ctx.line + prefix; line->content_len = ctx->parse_ctx.line_len - prefix; + line->content = git__strndup(ctx->parse_ctx.line + prefix, line->content_len); line->content_offset = ctx->parse_ctx.content_len - ctx->parse_ctx.remain_len; line->origin = origin; line->num_lines = 1; @@ -1038,6 +1038,8 @@ int git_patch_parsed_from_diff(git_patch **out, git_diff *d, size_t idx) static void patch_parsed__free(git_patch *p) { git_patch_parsed *patch = (git_patch_parsed *)p; + git_diff_line *line; + size_t i; if (!patch) return; @@ -1047,6 +1049,8 @@ static void patch_parsed__free(git_patch *p) git__free((char *)patch->base.binary.old_file.data); git__free((char *)patch->base.binary.new_file.data); git_array_clear(patch->base.hunks); + git_array_foreach(patch->base.lines, i, line) + git__free((char *) line->content); git_array_clear(patch->base.lines); git__free(patch->base.delta); diff --git a/tests/patch/parse.c b/tests/patch/parse.c index a40ad7b23..7eb987920 100644 --- a/tests/patch/parse.c +++ b/tests/patch/parse.c @@ -108,3 +108,23 @@ void test_patch_parse__files_with_whitespaces_succeeds(void) cl_git_pass(git_patch_from_buffer(&patch, PATCH_NAME_WHITESPACE, strlen(PATCH_NAME_WHITESPACE), NULL)); git_patch_free(patch); } + +void test_patch_parse__lifetime_of_patch_does_not_depend_on_buffer(void) +{ + git_buf diff = GIT_BUF_INIT, rendered = GIT_BUF_INIT; + git_patch *patch; + + cl_git_pass(git_buf_sets(&diff, PATCH_ORIGINAL_TO_CHANGE_MIDDLE)); + cl_git_pass(git_patch_from_buffer(&patch, diff.ptr, diff.size, NULL)); + git_buf_dispose(&diff); + + cl_git_pass(git_patch_to_buf(&rendered, patch)); + cl_assert_equal_s(PATCH_ORIGINAL_TO_CHANGE_MIDDLE, rendered.ptr); + git_buf_dispose(&rendered); + + cl_git_pass(git_patch_to_buf(&rendered, patch)); + cl_assert_equal_s(PATCH_ORIGINAL_TO_CHANGE_MIDDLE, rendered.ptr); + git_buf_dispose(&rendered); + + git_patch_free(patch); +} |