mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2008 05:42:04 +0000 (22:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2008 05:42:04 +0000 (22:42 -0700)
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>
builtin-mailinfo.c

index 4b82615..b99a5b6 100644 (file)
@@ -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