generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imap: Quote other 'atom-specials' and not just the space character

Browse Source 
Closes #517
This commit is contained in:
Steve Holme 2015-11-07 11:59:32 +00:00
parent 50bff12ac8
commit 23c4090fd3
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/imap.c
View File

@ -1817,36 +1817,46 @@ static CURLcode imap_sendf(struct connectdata *conn, const char *fmt, ...)
*/ */
static char *imap_atom(const char *str, bool escape_only) static char *imap_atom(const char *str, bool escape_only)
{ {
const char atom_specials[] = "(){ %*]";
const char *p1; const char *p1;
char *p2; char *p2;
size_t backsp_count = 0; size_t backsp_count = 0;
size_t quote_count = 0; size_t quote_count = 0;
bool space_exists = FALSE; bool others_exists = FALSE;
size_t newlen = 0; size_t newlen = 0;
char *newstr = NULL; char *newstr = NULL;
if(!str) if(!str)
return NULL; return NULL;
/* Count any unescaped characters */ /* Look for "atom-specials", counting the backslash and quote characters as
these will need escapping */
p1 = str; p1 = str;
while(*p1) { while(*p1) {
if(*p1 == '\\') if(*p1 == '\\')
backsp_count++; backsp_count++;
else if(*p1 == '"') else if(*p1 == '"')
quote_count++; quote_count++;
else if(!escape_only && (*p1 == ' ')) else if(!escape_only) {
space_exists = TRUE; const char *p3 = atom_specials;
while (*p3 && !others_exists) {
if(*p1 == *p3)
others_exists = TRUE;
p3++;
}
}
p1++; p1++;
} }
/* Does the input contain any unescaped characters? */ /* Does the input contain any "atom-special" characters? */
if(!backsp_count && !quote_count && !space_exists) if(!backsp_count && !quote_count && !others_exists)
return strdup(str); return strdup(str);
/* Calculate the new string length */ /* Calculate the new string length */
newlen = strlen(str) + backsp_count + quote_count + (space_exists ? 2 : 0); newlen = strlen(str) + backsp_count + quote_count + (others_exists ? 2 : 0);
/* Allocate the new string */ /* Allocate the new string */
newstr = (char *) malloc((newlen + 1) * sizeof(char)); newstr = (char *) malloc((newlen + 1) * sizeof(char));
@ -1855,7 +1865,7 @@ static char *imap_atom(const char *str, bool escape_only)
/* Surround the string in quotes if necessary */ /* Surround the string in quotes if necessary */
p2 = newstr; p2 = newstr;
if(space_exists) { if(others_exists) {
newstr[0] = '"'; newstr[0] = '"';
newstr[newlen - 1] = '"'; newstr[newlen - 1] = '"';
p2++; p2++;