moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Fix #20894: URL comparisons should not compare percent-encoded and

Browse Source 
unencoded reserved characters.
This commit is contained in:
micah 2007-08-29 21:39:33 -07:00
parent 02a54e9919
commit f4771e5299
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -40,8 +40,11 @@
translated by http_loop to RETROK.
* url.c (are_urls_equal): Don't call getchar_from_escaped_string
if u2 is shorter than u1.
(getchar_from_escaped_string): Don't decode reserved characters.
Handle illegally appearing '%'s as literal '%'s. Ensure hex
digits before attempting to decode.
(test_are_urls_equal): Added tests to handle u2 shorter than u1,
and %2f not treated the same as / (latter currently fails).
and %2f not treated the same as /.
* spider.c (in_url_list_p): Don't call are_urls_equal if one of
them is NULL.

14
src/url.c
View File

@ -1939,10 +1939,7 @@ getchar_from_escaped_string (const char *str, char *c)
if (p[0] == '%')
{
if (p[1] == 0)
return 0; /* error: invalid string */
if (p[1] == '%')
if (!ISXDIGIT(p[1]) || !ISXDIGIT(p[2]))
{
*c = '%';
return 1;
@ -1953,8 +1950,13 @@ getchar_from_escaped_string (const char *str, char *c)
return 0; /* error: invalid string */
*c = X2DIGITS_TO_NUM (p[1], p[2]);
return 3;
if (URL_RESERVED_CHAR(*c))
{
*c = '%';
return 1;
}
else
return 3;
}
}
else