Re: [PATCH] notes_merge_commit(): do not pass temporary buffer to other function

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 27, 2011, 16:59 UTC
Message-ID: <7vd3elyl8t.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1317098813-30839-1-git-send-email-mhagger@alum.mit.edu>

Michael Haggerty <mhagger@alum.mit.edu> writes:

Show 10 quoted lines

> I discovered this problem when an innocent modification to unrelated
> code triggered test failures.
>
>  notes-merge.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git notes-merge.c notes-merge.c
> index e1aaf43..baaf31f 100644
> --- notes-merge.c
> +++ notes-merge.c

It is Ok to play with -p0 yourself but please don't do that in the public.

Show 16 quoted lines

> @@ -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;
>  }