eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abort and release llcache handle on failure to process data. 

Make hlcache retrieval ignore erroneous contents.

svn path=/trunk/netsurf/; revision=10296
This commit is contained in:
John Mark Bell 2010-04-08 07:09:09 +00:00
parent 4682f0ccd8
commit bba7fbbd9b
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/content.c
View File

@ -527,6 +527,9 @@ nserror content_llcache_callback(llcache_handle *llcache,
if (handler_map[c->type].process_data(c,
(const char *) event->data.data.buf,
event->data.data.len) == false) {
llcache_handle_abort(c->llcache);
llcache_handle_release(c->llcache);
c->llcache = NULL;
c->status = CONTENT_STATUS_ERROR;
/** \todo It's not clear what error this is */
error = NSERROR_NOMEM;

5
content/hlcache.c
View File

@ -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);