summaryrefslogtreecommitdiff
path: root/riscos/plugin.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2007-03-18 17:09:55 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2007-03-18 17:09:55 +0000
commit703b5fea73f9bbdb4f41aebcd75f71d32d340a2d (patch)
treed04f837e5b02a3b90ab8a301974e250730ef6007 /riscos/plugin.c
parent0d750eac736e133eafb98cc31e1cdcabc64608c3 (diff)
downloadnetsurf-703b5fea73f9bbdb4f41aebcd75f71d32d340a2d.tar.gz
netsurf-703b5fea73f9bbdb4f41aebcd75f71d32d340a2d.tar.bz2
Ensure content owners check that they are still interested in a content
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
Diffstat (limited to 'riscos/plugin.c')
-rw-r--r--riscos/plugin.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/riscos/plugin.c b/riscos/plugin.c
index 302651e26..57f6f6515 100644
--- a/riscos/plugin.c
+++ b/riscos/plugin.c
@@ -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: