Title: [135768] branches/safari-536.28-branch/Source/WebKit2
- Revision
- 135768
- Author
- lforsch...@apple.com
- Date
- 2012-11-26 14:37:56 -0800 (Mon, 26 Nov 2012)
Log Message
Merged r131975. <rdar://problem/12589198>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (135767 => 135768)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-26 22:36:03 UTC (rev 135767)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-26 22:37:56 UTC (rev 135768)
@@ -1,5 +1,23 @@
2012-11-26 Lucas Forschler <lforsch...@apple.com>
+ Merge r131975
+
+ 2012-10-19 Andreas Kling <kl...@webkit.org>
+
+ Race condition in WebProcessProxy::handleGetPlugins().
+ <http://webkit.org/b/99903>
+ <rdar://problem/12541471>
+
+ Reviewed by Anders Carlsson.
+
+ Scope the Vector<PluginModuleInfo> so that all the destructors are guaranteed
+ to have run when sendDidGetPlugins() executes on the main thread.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::handleGetPlugins):
+
+2012-11-26 Lucas Forschler <lforsch...@apple.com>
+
Merge r132713
2012-10-26 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-536.28-branch/Source/WebKit2/UIProcess/WebContext.cpp (135767 => 135768)
--- branches/safari-536.28-branch/Source/WebKit2/UIProcess/WebContext.cpp 2012-11-26 22:36:03 UTC (rev 135767)
+++ branches/safari-536.28-branch/Source/WebKit2/UIProcess/WebContext.cpp 2012-11-26 22:37:56 UTC (rev 135768)
@@ -635,9 +635,11 @@
OwnPtr<Vector<PluginInfo> > pluginInfos = adoptPtr(new Vector<PluginInfo>);
- Vector<PluginModuleInfo> plugins = m_pluginInfoStore.plugins();
- for (size_t i = 0; i < plugins.size(); ++i)
- pluginInfos->append(plugins[i].info);
+ {
+ Vector<PluginModuleInfo> plugins = m_pluginInfoStore.plugins();
+ for (size_t i = 0; i < plugins.size(); ++i)
+ pluginInfos->append(plugins[i].info);
+ }
// NOTE: We have to pass the PluginInfo vector to the secondary thread via a pointer as otherwise
// we'd end up with a deref() race on all the WTF::Strings it contains.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
