diff options
| author | Steve Block <steveblock@google.com> | 2010-09-10 04:32:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 04:32:49 -0700 |
| commit | 7777773eaa086fa6180ab47e86dd7d903a2e7b2f (patch) | |
| tree | 860dd3c45ff1900bec3fc746654fb1074b24742a /WebCore | |
| parent | 229c8c38532f7fb3da4cb45a4d18f559613af829 (diff) | |
| parent | 6dba6e09f232d333432972b64d0074cbee59ca7a (diff) | |
| download | external_webkit-7777773eaa086fa6180ab47e86dd7d903a2e7b2f.zip external_webkit-7777773eaa086fa6180ab47e86dd7d903a2e7b2f.tar.gz external_webkit-7777773eaa086fa6180ab47e86dd7d903a2e7b2f.tar.bz2 | |
am 6dba6e09: Cherry-pick security fix in WebKit change 65280
Merge commit '6dba6e09f232d333432972b64d0074cbee59ca7a' into gingerbread-plus-aosp
* commit '6dba6e09f232d333432972b64d0074cbee59ca7a':
Cherry-pick security fix in WebKit change 65280
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/page/Page.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp index c7d3de1..7de1a09 100644 --- a/WebCore/page/Page.cpp +++ b/WebCore/page/Page.cpp @@ -393,7 +393,13 @@ void Page::refreshPlugins(bool reload) HashSet<Page*>::iterator end = allPages->end(); for (HashSet<Page*>::iterator it = allPages->begin(); it != end; ++it) { - (*it)->m_pluginData = 0; + Page* page = *it; + + // Clear out the page's plug-in data. + if (page->m_pluginData) { + page->m_pluginData->disconnectPage(); + page->m_pluginData = 0; + } if (reload) { for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) { |