From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Jul 2008 05:42:04 +0000 (-0700)
Subject: mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
X-Git-Tag: v1.6.0-rc0~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e102bf7c83281944ffd9202a7d35c514e4a5644;p=git.git

mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line

A patch title "[PATCH] 1" was sanitized by the original code by stripping
the "[PATCH]" from the front, but after the conversion to use strbuf this
behaviour was broken due to a counting error.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 4b8261552..b99a5b6f9 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -225,10 +225,9 @@ static void cleanup_subject(struct strbuf *subject)
 			continue;
 		case '[':
 			if ((pos = strchr(subject->buf, ']'))) {
-				remove = pos - subject->buf + 1;
-				/* Don't remove too much. */
-				if (remove <= (subject->len - remove + 1) * 2) {
-					strbuf_remove(subject, 0, remove);
+				remove = pos - subject->buf;
+				if (remove <= (subject->len - remove) * 2) {
+					strbuf_remove(subject, 0, remove + 1);
 					continue;
 				}
 			} else