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

Fix bug #3390958: forcibly discard references to any child objects if we fail to complete conversion of an HTML content

Browse Source 
svn path=/trunk/netsurf/; revision=12641
This commit is contained in:
John Mark Bell 2011-08-20 01:13:51 +00:00
parent 0860ac499d
commit 664a9381ce
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
render/html.c
View File

@ -96,6 +96,7 @@ static void html_object_done(struct box *box, hlcache_handle *object,
static void html_object_failed(struct box *box, html_content *content, static void html_object_failed(struct box *box, html_content *content,
bool background); bool background);
static void html_object_refresh(void *p); static void html_object_refresh(void *p);
static void html_destroy_objects(html_content *html);
static void html_destroy_frameset(struct content_html_frames *frameset); static void html_destroy_frameset(struct content_html_frames *frameset);
static void html_destroy_iframe(struct content_html_iframe *iframe); static void html_destroy_iframe(struct content_html_iframe *iframe);
#if ALWAYS_DUMP_FRAMESET #if ALWAYS_DUMP_FRAMESET
@ -662,7 +663,8 @@ void html_finish_conversion(html_content *c)
LOG(("XML to box")); LOG(("XML to box"));
content_set_status(&c->base, messages_get("Processing")); content_set_status(&c->base, messages_get("Processing"));
content_broadcast(&c->base, CONTENT_MSG_STATUS, msg_data); content_broadcast(&c->base, CONTENT_MSG_STATUS, msg_data);
if (!xml_to_box(html, c)) { if (xml_to_box(html, c) == false) {
html_destroy_objects(c);
msg_data.error = messages_get("NoMemory"); msg_data.error = messages_get("NoMemory");
content_broadcast(&c->base, CONTENT_MSG_ERROR, msg_data); content_broadcast(&c->base, CONTENT_MSG_ERROR, msg_data);
content_set_error(&c->base); content_set_error(&c->base);
@ -677,8 +679,9 @@ void html_finish_conversion(html_content *c)
#endif #endif
/* extract image maps - can't do this sensibly in xml_to_box */ /* extract image maps - can't do this sensibly in xml_to_box */
if (!imagemap_extract(html, c)) { if (imagemap_extract(html, c) == false) {
LOG(("imagemap extraction failed")); LOG(("imagemap extraction failed"));
html_destroy_objects(c);
msg_data.error = messages_get("NoMemory"); msg_data.error = messages_get("NoMemory");
content_broadcast(&c->base, CONTENT_MSG_ERROR, msg_data); content_broadcast(&c->base, CONTENT_MSG_ERROR, msg_data);
content_set_error(&c->base); content_set_error(&c->base);
@ -1942,6 +1945,11 @@ void html_destroy(struct content *c)
} }
/* Free objects */ /* Free objects */
html_destroy_objects(html);
}
void html_destroy_objects(html_content *html)
{
while (html->object_list != NULL) { while (html->object_list != NULL) {
struct content_html_object *victim = html->object_list; struct content_html_object *victim = html->object_list;
@ -1959,7 +1967,8 @@ void html_destroy(struct content *c)
} }
} }
void html_destroy_frameset(struct content_html_frames *frameset) { void html_destroy_frameset(struct content_html_frames *frameset)
{
int i; int i;
if (frameset->name) { if (frameset->name) {
@ -1988,7 +1997,8 @@ void html_destroy_frameset(struct content_html_frames *frameset) {
} }
} }
void html_destroy_iframe(struct content_html_iframe *iframe) { void html_destroy_iframe(struct content_html_iframe *iframe)
{
struct content_html_iframe *next; struct content_html_iframe *next;
next = iframe; next = iframe;
while ((iframe = next) != NULL) { while ((iframe = next) != NULL) {