mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 12:36:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve commentary.

Browse Source 
Stop leaking object_scheme in error cases.

svn path=/trunk/netsurf/; revision=11778
This commit is contained in:
John Mark Bell 2011-02-23 23:05:36 +00:00
parent b193361d8f
commit b967824575
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/llcache.c
View File

@ -2000,7 +2000,9 @@ nserror llcache_fetch_redirect(llcache_object *object, const char *target,
return NSERROR_NOMEM;
}
/* Ensure that redirects to file:/// only happen for valid schemes */
/* Reject attempts to redirect from unvalidated to validated schemes
* A "validated" scheme is one over which we have some guarantee that
* the source is trustworthy. */
result = url_scheme(object->url, &object_scheme);
if (result != URL_FUNC_OK) {
free(url);
@ -2009,17 +2011,19 @@ nserror llcache_fetch_redirect(llcache_object *object, const char *target,
result = url_scheme(url, &scheme);
if (result != URL_FUNC_OK) {
free(object_scheme);
free(url);
return NSERROR_NOMEM;
}
/* resource is allowed to redirect anywhere */
/* resource: and about: are allowed to redirect anywhere */
if ((strcasecmp(object_scheme, "resource") != 0) &&
(strcasecmp(object_scheme, "about") != 0)) {
/* file, about and resource are not valid redirect targets */
if ((strcasecmp(scheme, "file") == 0) ||
(strcasecmp(scheme, "about") == 0) ||
(strcasecmp(scheme, "resource") == 0)) {
free(object_scheme);
free(scheme);
free(url);
return NSERROR_OK;