From 852844561e8daaa6689cab48a725f764ad5779cb Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Tue, 27 Sep 2011 06:46:53 +0200 Subject: [PATCH] notes_merge_commit(): do not pass temporary buffer to other function It is unsafe to pass a temporary buffer as an argument to read_directory(). Signed-off-by: Michael Haggerty Acked-by: Johan Herland Signed-off-by: Junio C Hamano --- notes-merge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/notes-merge.c b/notes-merge.c index e1aaf43b43..baaf31f4ae 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -680,7 +680,7 @@ int notes_merge_commit(struct notes_merge_options *o, * Finally store the new commit object SHA1 into 'result_sha1'. */ struct dir_struct dir; - const char *path = git_path(NOTES_MERGE_WORKTREE "/"); + char *path = xstrdup(git_path(NOTES_MERGE_WORKTREE "/")); int path_len = strlen(path), i; const char *msg = strstr(partial_commit->buffer, "\n\n"); @@ -720,6 +720,7 @@ int notes_merge_commit(struct notes_merge_options *o, result_sha1); OUTPUT(o, 4, "Finalized notes merge commit: %s", sha1_to_hex(result_sha1)); + free(path); return 0; } -- 2.11.4.GIT