summaryrefslogtreecommitdiff
path: root/content/urldb.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2006-04-11 17:00:26 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2006-04-11 17:00:26 +0000
commit4ecbfb483c96ea6f994dfc0aaab6e82aec8e7aa4 (patch)
treea3de13c86f96ab19e10e32f99a83622a24e5a769 /content/urldb.c
parente0ba5089922f0827ae4115d5f94e4227628de2ff (diff)
downloadnetsurf-4ecbfb483c96ea6f994dfc0aaab6e82aec8e7aa4.tar.gz
netsurf-4ecbfb483c96ea6f994dfc0aaab6e82aec8e7aa4.tar.bz2
Handle memory exhaustion for version 1.06 URL files
Log failure to insert from version 1.05 URL files for debugging purposes svn path=/trunk/netsurf/; revision=2523
Diffstat (limited to 'content/urldb.c')
-rw-r--r--content/urldb.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/content/urldb.c b/content/urldb.c
index 1c3c6de5b..bd5406754 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -318,7 +318,9 @@ void urldb_load(const char *filename)
length = strlen(s) - 1;
s[length] = '\0';
- urldb_add_url(s);
+ if (!urldb_add_url(s)) {
+ LOG(("Failed inserting '%s'", s));
+ }
p = urldb_find_url(s);
} else {
char scheme[64], ports[6];
@@ -348,6 +350,11 @@ void urldb_load(const char *filename)
p = urldb_add_path(scheme, port, h, s, NULL,
url);
+ if (!p) {
+ LOG(("Failed inserting '%s'", url));
+ die("Memory exhausted whilst loading "
+ "URL file");
+ }
}
if (!fgets(s, MAXIMUM_URL_LENGTH, fp))
@@ -669,7 +676,6 @@ bool urldb_add_url(const char *url)
/* Get path entry */
p = urldb_add_path(scheme, port, h, plq, fragment, urlt);
if (!p) {
-
return false;
}