summaryrefslogtreecommitdiff
path: root/content/hlcache.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2010-04-08 07:09:09 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2010-04-08 07:09:09 +0000
commitbba7fbbd9b8c8244ff5a410190d5f8dfac472e41 (patch)
treeb52b00a531d3df13743464d103ba8d77e4b9eb26 /content/hlcache.c
parent4682f0ccd866b86b430dbed8862ede91c1d1a061 (diff)
downloadnetsurf-bba7fbbd9b8c8244ff5a410190d5f8dfac472e41.tar.gz
netsurf-bba7fbbd9b8c8244ff5a410190d5f8dfac472e41.tar.bz2
Abort and release llcache handle on failure to process data.
Make hlcache retrieval ignore erroneous contents. svn path=/trunk/netsurf/; revision=10296
Diffstat (limited to 'content/hlcache.c')
-rw-r--r--content/hlcache.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/hlcache.c b/content/hlcache.c
index bbe0cd753..f54ee1937 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -364,6 +364,7 @@ nserror hlcache_find_content(hlcache_retrieval_ctx *ctx)
/* Search list of cached contents for a suitable one */
for (entry = hlcache_content_list; entry != NULL; entry = entry->next) {
+ hlcache_handle entry_handle = { entry, NULL, NULL };
const llcache_handle *entry_llcache;
/** \todo Need to ensure that quirks mode matches */
@@ -372,6 +373,10 @@ nserror hlcache_find_content(hlcache_retrieval_ctx *ctx)
if (entry->content == NULL)
continue;
+ /* Ignore contents in the error state */
+ if (content_get_status(&entry_handle) == CONTENT_STATUS_ERROR)
+ continue;
+
/* Ensure that content uses same low-level object as
* low-level handle */
entry_llcache = content_get_llcache_handle(entry->content);