/* Handle plain quote_ldap */
if (!dn)
- for (; c = *s++; *t++ = c)
+ {
+ while ((c = *s++))
+ {
if (!isalnum(c))
{
if (Ustrchr(LDAP_QUOTE, c) != NULL)
{
sprintf(CS t, "%%5C%02X", c); /* e.g. * => %5C2A */
t += 5;
+ continue;
}
- else if (Ustrchr(URL_NONQUOTE, c) == NULL) /* e.g. ] => %5D */
+ if (Ustrchr(URL_NONQUOTE, c) == NULL) /* e.g. ] => %5D */
{
sprintf(CS t, "%%%02X", c);
t += 3;
+ continue;
}
}
+ *t++ = c; /* unquoted character */
+ }
+ }
/* Handle quote_ldap_dn */
{
if (Ustrchr(LDAP_DN_QUOTE, c) != NULL)
{
- Ustrcpy(t, US"%5C"); /* insert \ where needed */
+ memcpy(t, US"%5C", 3); /* insert \ where needed */
t += 3; /* fall through to check URL */
}
if (Ustrchr(URL_NONQUOTE, c) == NULL) /* e.g. ] => %5D */
while (*ss++)
{
- Ustrcpy(t, US"%5C%20");
+ memcpy(t, US"%5C%20", 6);
t += 6;
}
}