From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri, 1 Sep 2006 08:49:29 +0000 (+0200)
Subject: fmt-merge-msg: fix off-by-one bug
X-Git-Tag: v1.4.3-rc1~135^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af04b1271090801b277938836dcb7a39fc059721;p=git.git

fmt-merge-msg: fix off-by-one bug

Thanks to the recent malloc()->xmalloc() change, and XMALLOC_POISON, this bug
was found.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index ed59e77e1..432963db9 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -142,7 +142,7 @@ static int handle_line(char *line)
 		if (origin[0] == '\'' && origin[len - 1] == '\'') {
 			char *new_origin = xmalloc(len - 1);
 			memcpy(new_origin, origin + 1, len - 2);
-			new_origin[len - 1] = 0;
+			new_origin[len - 2] = 0;
 			origin = new_origin;
 		} else
 			origin = strdup(origin);