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

Fix handling of hosts with no paths attached (fixes #1505891)

Browse Source 
svn path=/trunk/netsurf/; revision=2620
This commit is contained in:
John Mark Bell 2006-06-15 15:06:59 +00:00
parent c1dbdad995
commit 026ba672ae
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
content/urldb.c
View File

@ -1136,7 +1136,11 @@ void urldb_iterate_partial(const char *prefix,
return;
}
urldb_iterate_partial_path(&h->paths, slash + 1, callback);
if (h->paths.children) {
/* Have paths, iterate them */
urldb_iterate_partial_path(&h->paths, slash + 1,
callback);
}
} else {
int len = strlen(prefix);
@ -1195,10 +1199,12 @@ bool urldb_iterate_partial_host(struct search_node *root, const char *prefix,
callback))
return false;
/* and extract all paths attached to this host */
if (!urldb_iterate_entries_path(&root->data->paths,
callback)) {
return false;
if (root->data->paths.children) {
/* and extract all paths attached to this host */
if (!urldb_iterate_entries_path(&root->data->paths,
callback)) {
return false;
}
}
if (!urldb_iterate_partial_host(root->right, prefix,
@ -1294,8 +1300,12 @@ bool urldb_iterate_entries_host(struct search_node *parent,
if (!urldb_iterate_entries_host(parent->left, callback))
return false;
if (!urldb_iterate_entries_path(&parent->data->paths, callback)) {
return false;
if (parent->data->paths.children) {
/* We have paths, so iterate them */
if (!urldb_iterate_entries_path(&parent->data->paths,
callback)) {
return false;
}
}
if (!urldb_iterate_entries_host(parent->right, callback))