diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-07-20 11:06:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 11:06:23 +0100 |
| commit | f33ca472d1a160ab5abbdf07d434455d7d1ee15c (patch) | |
| tree | d24aa48e2fba6e4517ca8a613e295d7d1c9bfeb7 /src/patch_parse.c | |
| parent | d78a1b186d4c05e0be8c47d445e1149d393d6b43 (diff) | |
| parent | dedf70ad2b9f3dd5a5b299f64476285653cf62b7 (diff) | |
| download | libgit2-f33ca472d1a160ab5abbdf07d434455d7d1ee15c.tar.gz | |
Merge pull request #5158 from pks-t/pks/patch-parsed-lifetime
patch_parse: do not depend on parsed buffer's lifetime
Diffstat (limited to 'src/patch_parse.c')
| -rw-r--r-- | src/patch_parse.c | 6 |
1 files changed, 5 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); |