summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-11-04 21:26:22 +0100
committerJunio C Hamano <gitster@pobox.com>2007-11-04 15:16:59 -0800
commitc2015b3ae0d52ccae33ee00c2b25b8402c66bdf0 (patch)
tree89cbc34d7def468e193b431bacb07c88d305cb9a
parent140dd77a5cb2e61dcb942e245a2474fae95e42a5 (diff)
downloadgit-c2015b3ae0d52ccae33ee00c2b25b8402c66bdf0.tar.gz
Fix an infinite loop in sq_quote_buf().
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>
-rw-r--r--quote.c2
-rwxr-xr-xt/t5510-fetch.sh7
2 files changed, 8 insertions, 1 deletions
diff --git a/quote.c b/quote.c
index 482be05b7a..919d0920ab 100644
--- 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)) {
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index d217657146..aad863db7a 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -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