diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-09-21 09:17:06 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-09-22 14:43:37 +0200 |
| commit | 3b05f79ef8c88468e2684760ec39065c739a1f3d (patch) | |
| tree | a3be24a01be8ba967621bd8bba51b46ddb218f2a | |
| parent | a4db3f70468c31c0d579e6b9dcd4e90cd9f0d1a8 (diff) | |
imap: quote atoms properly when escaping characters
Updates test 800 to verify
Fixes #1902
Closes #1903
| -rw-r--r-- | lib/imap.c | 4 | ||||
| -rw-r--r-- | tests/data/test800 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/imap.c b/lib/imap.c index d37113aae..954d18f37 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -1797,7 +1797,7 @@ static char *imap_atom(const char *str, bool escape_only) return strdup(str); /* Calculate the new string length */ - newlen = strlen(str) + backsp_count + quote_count + (others_exists ? 2 : 0); + newlen = strlen(str) + backsp_count + quote_count + (escape_only ? 0 : 2); /* Allocate the new string */ newstr = (char *) malloc((newlen + 1) * sizeof(char)); @@ -1806,7 +1806,7 @@ static char *imap_atom(const char *str, bool escape_only) /* Surround the string in quotes if necessary */ p2 = newstr; - if(others_exists) { + if(!escape_only) { newstr[0] = '"'; newstr[newlen - 1] = '"'; p2++; diff --git a/tests/data/test800 b/tests/data/test800 index 1ac1da59b..360206b43 100644 --- a/tests/data/test800 +++ b/tests/data/test800 @@ -31,7 +31,7 @@ imap IMAP FETCH message </name> <command> -'imap://%HOSTIP:%IMAPPORT/800/;UID=1' -u "user*:secret{" +'imap://%HOSTIP:%IMAPPORT/800/;UID=1' -u '"user:sec"ret{' </command> </client> @@ -40,7 +40,7 @@ IMAP FETCH message <verify> <protocol> A001 CAPABILITY
-A002 LOGIN "user*" "secret{"
+A002 LOGIN "\"user" "sec\"ret{"
A003 SELECT 800
A004 FETCH 1 BODY[]
A005 LOGOUT
|