diff options
| author | Patrick Steinhardt <ps@pks.im> | 2019-07-20 18:49:48 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2019-07-20 18:49:48 +0200 |
| commit | a613832ef35b2901896211c4c4eaeb31ed2b3cbc (patch) | |
| tree | 4c0cc856971dda43c4c4e71fa7107b464c8e139f | |
| parent | e07dbc92d113fbddd2a042b45ef1a01347492a4c (diff) | |
| download | libgit2-a613832ef35b2901896211c4c4eaeb31ed2b3cbc.tar.gz | |
patch_parse: fix segfault due to line containing static contents
With commit dedf70ad2 (patch_parse: do not depend on parsed buffer's
lifetime, 2019-07-05), all lines of the patch are allocated with
`strdup` to make lifetime of the parsed patch independent of the buffer
that is currently being parsed. In patch b08932824 (patch_parse: ensure
valid patch output with EOFNL, 2019-07-11), we introduced another
code location where we add lines to the parsed patch. But as that one
was implemented via a separate pull request, it wasn't converted to use
`strdup`, as well. As a consequence, we generate a segfault when trying
to deallocate the potentially static buffer that's now in some of the
lines.
Use `git__strdup` to fix the issue.
| -rw-r--r-- | src/patch_parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/patch_parse.c b/src/patch_parse.c index 70c33ed7d..29dc8b818 100644 --- a/src/patch_parse.c +++ b/src/patch_parse.c @@ -653,7 +653,7 @@ static int parse_hunk_body( memset(line, 0x0, sizeof(git_diff_line)); - line->content = ctx->parse_ctx.line; + line->content = git__strdup(ctx->parse_ctx.line); line->content_len = ctx->parse_ctx.line_len; line->content_offset = ctx->parse_ctx.content_len - ctx->parse_ctx.remain_len; line->origin = eof_for_origin(last_origin); |