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

Ensure content owners check that they are still interested in a content

Browse Source 
when receiving notification that the content's in error. This prevents 
content pointers being corrupted when redirects occur. Fixes 1522002, 
1551475.

svn path=/trunk/netsurf/; revision=3211
This commit is contained in:
John Mark Bell 2007-03-18 17:09:55 +00:00
parent 0d750eac73
commit 703b5fea73
3 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/css.c
View File

@ -919,9 +919,16 @@ void css_atimport_callback(content_msg msg, struct content *css,
#endif
/* todo: handle AUTH and SSL */
case CONTENT_MSG_ERROR:
c->data.css.import_content[i] = 0;
c->active--;
content_add_error(c, "?", 0);
/* The stylesheet we were fetching may have been
* redirected, in that case, the object pointers
* will differ, so ensure that the object that's
* in error is still in use by us before invalidating
* the pointer */
if (c->data.css.import_content[i] == css) {
c->data.css.import_content[i] = 0;
c->active--;
content_add_error(c, "?", 0);
}
break;
case CONTENT_MSG_STATUS:

33
render/html.c
View File

@ -920,9 +920,16 @@ void html_convert_css_callback(content_msg msg, struct content *css,
break;
case CONTENT_MSG_ERROR:
c->data.html.stylesheet_content[i] = 0;
c->active--;
content_add_error(c, "?", 0);
/* The stylesheet we were fetching may have been
* redirected, in that case, the object pointers
* will differ, so ensure that the object that's
* in error is still in use by us before invalidating
* the pointer */
if (c->data.html.stylesheet_content[i] == css) {
c->data.html.stylesheet_content[i] = 0;
c->active--;
content_add_error(c, "?", 0);
}
break;
case CONTENT_MSG_STATUS:
@ -1161,13 +1168,21 @@ void html_object_callback(content_msg msg, struct content *object,
break;
case CONTENT_MSG_ERROR:
c->data.html.object[i].content = 0;
c->active--;
content_add_error(c, "?", 0);
html_set_status(c, data.error);
content_broadcast(c, CONTENT_MSG_STATUS, data);
html_object_failed(box, c,
/* The object we were fetching may have been
* redirected, in that case, the object pointers
* will differ, so ensure that the object that's
* in error is still in use by us before invalidating
* the pointer */
if (c->data.html.object[i].content == object) {
c->data.html.object[i].content = 0;
c->active--;
content_add_error(c, "?", 0);
html_set_status(c, data.error);
content_broadcast(c, CONTENT_MSG_STATUS,
data);
html_object_failed(box, c,
c->data.html.object[i].background);
}
break;
case CONTENT_MSG_STATUS:

9
riscos/plugin.c
View File

@ -1683,7 +1683,14 @@ void plugin_stream_callback(content_msg msg, struct content *c,
break;
case CONTENT_MSG_ERROR:
plugin_destroy_stream(p, plugin_STREAM_DESTROY_ERROR);
/* The plugin we were fetching may have been
* redirected, in that case, the object pointers
* will differ, so ensure that the object that's
* in error is still in use by us before destroying
* the stream */
if (p->c == c)
plugin_destroy_stream(p,
plugin_STREAM_DESTROY_ERROR);
break;
case CONTENT_MSG_REDIRECT: