OSDN Git Service

unquote_c_style: fix off-by-one.
authorPierre Habouzit <madcoder@debian.org>
Thu, 6 Mar 2008 21:28:19 +0000 (22:28 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Mar 2008 21:31:30 +0000 (13:31 -0800)
The optional endp parameter to unquote_c_style() was supposed to point at
a location past the closing double quote, but it was going one beyond it.

git-fast-import used this function heavily and the bug caused it to
misparse the input stream, especially when parsing a rename command:

R "filename that needs quoting" rename-target-name

Because the function erroneously ate the whitespace after the closing dq,
this triggered "Missing space after source" error when it shouldn't.

Thanks to Adeodato Simò for having caught this.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
quote.c

diff --git a/quote.c b/quote.c
index d061626..40702f6 100644 (file)
--- a/quote.c
+++ b/quote.c
@@ -288,7 +288,7 @@ int unquote_c_style(struct strbuf *sb, const char *quoted, const char **endp)
                switch (*quoted++) {
                  case '"':
                        if (endp)
-                               *endp = quoted + 1;
+                               *endp = quoted;
                        return 0;
                  case '\\':
                        break;