[PATCH] fmt-merge-msg: plug small leak of commit buffer

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



A broken or badly formatted commit might not record author or
committer lines; the function record_person() returned after
calling get_commit_buffer() without calling unuse_commit_buffer()
on the memory, potentially leaking it.

Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---

 * to be applied on bc6b8fc1 (use get_commit_buffer everywhere,
   2014-06-10)

 builtin/fmt-merge-msg.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 01f6d59..076264d 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -238,8 +238,10 @@ static void record_person(int which, struct string_list *people,
 	field = (which == 'a') ? "\nauthor " : "\ncommitter ";
 	buffer = get_commit_buffer(commit);
 	name = strstr(buffer, field);
-	if (!name)
+	if (!name) {
+		unuse_commit_buffer(commit, buffer);
 		return;
+	}
 	name += strlen(field);
 	name_end = strchrnul(name, '<');
 	if (*name_end)
-- 
2.4.0-rc2-173-gefc434b

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]