From 7f41432c191c70f7f782802cd17e95e87a9a7671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BChlstrasser?= Date: Thu, 26 Apr 2018 10:15:26 +0200 Subject: URL: fix ASCII dependency in strcpy_url and strlen_url Commit 3c630f9b0af097663a64e5c875c580aa9808a92b partially reverted the changes from commit dd7521bcc1b7a6fcb53c31f9bd1192fcc884bd56 because of the problem that strcpy_url() was modified unilaterally without also modifying strlen_url(). As a consequence strcpy_url() was again depending on ASCII encoding. This change fixes strlen_url() and strcpy_url() in parallel to use a common host-encoding independent criterion for deciding whether an URL character must be %-escaped. Closes #2535 --- lib/transfer.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lib/transfer.c') diff --git a/lib/transfer.c b/lib/transfer.c index 9712a7f7e..5c8eb31d3 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1446,6 +1446,16 @@ static const char *find_host_sep(const char *url) return sep < query ? sep : query; } +/* + * Decide in an encoding-independent manner whether a character in an + * URL must be escaped. The same criterion must be used in strlen_url() + * and strcpy_url(). + */ +static bool urlchar_needs_escaping(int c) +{ + return !(ISCNTRL(c) || ISSPACE(c) || ISGRAPH(c)); +} + /* * strlen_url() returns the length of the given URL if the spaces within the * URL were properly URL encoded. @@ -1474,7 +1484,7 @@ static size_t strlen_url(const char *url, bool relative) left = FALSE; /* fall through */ default: - if(*ptr >= 0x80) + if(urlchar_needs_escaping(*ptr)) newlen += 2; newlen++; break; @@ -1519,7 +1529,7 @@ static void strcpy_url(char *output, const char *url, bool relative) left = FALSE; /* fall through */ default: - if(*iptr >= 0x80) { + if(urlchar_needs_escaping(*iptr)) { snprintf(optr, 4, "%%%02x", *iptr); optr += 3; } -- cgit v1.2.3