threads / patch / 5449

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

Subject: [PATCH] fmt-merge-msg: fix off-by-one bug

## tl;dr

One message between Sep 1, 2006 and Sep 1, 2006. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Johannes Schindelin· Sep 1, 2006, 08:49 UTC · lore

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

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
 builtin-fmt-merge-msg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to builtin-fmt-merge-msg.c +1 −1
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);
-- 
1.4.2.gc2fc-dirty

← back to recent threads