Title: [94747] branches/chromium/874/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
- Revision
- 94747
- Author
- aba...@webkit.org
- Date
- 2011-09-08 00:30:25 -0700 (Thu, 08 Sep 2011)
Log Message
Merge 94721 - FrameLoader::addExtraFieldsToRequest can crash when called from or after FrameLoader::detachFromParent
https://bugs.webkit.org/show_bug.cgi?id=61810
Reviewed by Eric Seidel.
Fix this crash as suggested by Darin Fisher in
https://bugs.webkit.org/show_bug.cgi?id=61810#c21. This patch does not
include the test requested by Alexey Proskuryakov in
https://bugs.webkit.org/show_bug.cgi?id=61810#c6. I would really much
rather include a test with this patch, but my attempts to write a test
have failed. :(
* src/WebPluginContainerImpl.cpp:
(WebKit::WebPluginContainerImpl::loadFrameRequest):
TBR=aba...@webkit.org
Review URL: http://codereview.chromium.org/7846013
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (94746 => 94747)
--- branches/chromium/874/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2011-09-08 07:05:15 UTC (rev 94746)
+++ branches/chromium/874/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2011-09-08 07:30:25 UTC (rev 94747)
@@ -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) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
