Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Unified Diff: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

Issue 7846013: Merge 94721 - FrameLoader::addExtraFieldsToRequest can crash when called from or after FrameLoade... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (revision 94746)
+++ Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (working copy)
@@ -386,7 +386,7 @@
void WebPluginContainerImpl::loadFrameRequest(const WebURLRequest& request, const WebString& target, bool notifyNeeded, void* notifyData)
{
Frame* frame = m_element->document()->frame();
- if (!frame)
+ if (!frame || !frame->loader()->documentLoader())
return; // FIXME: send a notification in this case?
if (notifyNeeded) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698