Code

Fix an infinite loop in sq_quote_buf().
authorJohannes Sixt <johannes.sixt@telecom.at>
Sun, 4 Nov 2007 20:26:22 +0000 (21:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Nov 2007 23:16:59 +0000 (15:16 -0800)
sq_quote_buf() treats single-quotes and exclamation marks specially, but
it incorrectly parsed the input for single-quotes and backslashes.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
quote.c
t/t5510-fetch.sh

diff --git a/quote.c b/quote.c
index 482be05b7af159b9b47095fedfbdfa3bda65c748..919d0920abfc0bd2becbcc35fd065514b9651281 100644 (file)
--- a/quote.c
+++ b/quote.c
@@ -26,7 +26,7 @@ void sq_quote_buf(struct strbuf *dst, const char *src)
 
        strbuf_addch(dst, '\'');
        while (*src) {
-               size_t len = strcspn(src, "'\\");
+               size_t len = strcspn(src, "'!");
                strbuf_add(dst, src, len);
                src += len;
                while (need_bs_quote(*src)) {
index d2176571462af7dd66ecdb197731cd9d810dccdf..aad863db7ad74ed217b3bcc76de43556f9fe7a07 100755 (executable)
@@ -208,4 +208,11 @@ test_expect_success 'fetch with a non-applying branch.<name>.merge' '
        git fetch blub
 '
 
+# the strange name is: a\!'b
+test_expect_success 'quoting of a strangely named repo' '
+       ! git fetch "a\\!'\''b" > result 2>&1 &&
+       cat result &&
+       grep "fatal: '\''a\\\\!'\''b'\''" result
+'
+
 test_done