summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-09-01 08:49:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-01 12:20:03 (GMT)
commitaf04b1271090801b277938836dcb7a39fc059721 (patch)
treeaa21dc5231b7103660742e30d51982d363c8c8f2 /builtin-fmt-merge-msg.c
parent8c02eee29e116355474250a5e9270db6034c60de (diff)
downloadgit-af04b1271090801b277938836dcb7a39fc059721.zip
git-af04b1271090801b277938836dcb7a39fc059721.tar.gz
git-af04b1271090801b277938836dcb7a39fc059721.tar.bz2
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>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
-rw-r--r--builtin-fmt-merge-msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index ed59e77..432963d 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);