2007-11-09 Jon Honeycutt <jhoneycutt@apple.com>

        Reviewed by Sam.

        <rdar://5585900>: Safari crashes when selected in context menu to open
        audio format files (au, aif) with QT 7.3

        The crash occurred on a machine where QT 7.3 was failing to initialize.
        The fix is to avoid sending streams to full-page plugins that've failed
        to load

        * WebFrame.cpp:
        (WebFrame::finishedLoading): Check plugin status before calling manual
        stream methods
        (WebFrame::setMainDocumentError): Same
        (WebFrame::committedLoad): Same

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 3fd320011f22a511b7221c02b1011b631da55cbd..b3b00044e24e086e9360344ede81bc0d5902ebd5 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,20 @@
+2007-11-09  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Reviewed by Sam.
+
+        <rdar://5585900>: Safari crashes when selected in context menu to open
+        audio format files (au, aif) with QT 7.3
+
+        The crash occurred on a machine where QT 7.3 was failing to initialize.
+        The fix is to avoid sending streams to full-page plugins that've failed 
+        to load
+
+        * WebFrame.cpp:
+        (WebFrame::finishedLoading): Check plugin status before calling manual
+        stream methods
+        (WebFrame::setMainDocumentError): Same
+        (WebFrame::committedLoad): Same
+
 2007-11-09  Sam Weinig  <sam@webkit.org>
 
         Rubber stamped by Oliver.

diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index d17fcd69c269c2ac6daf2f8e02e453baa885be90..31c1f7b8af3319c2bbc00c86c43d020c21a36f5e 100644 (file)
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -1728,7 +1728,8 @@ void WebFrame::finishedLoading(DocumentLoader* loader)
     if (!d->m_pluginView)
         committedLoad(loader, 0, 0);
     else {
-        d->m_pluginView->didFinishLoading();
+        if (d->m_pluginView->status() == PluginStatusLoadedSuccessfully)
+            d->m_pluginView->didFinishLoading();
         d->m_pluginView = 0;
         d->m_hasSentResponseToPlugin = false;
     }
@@ -1926,7 +1927,8 @@ PassRefPtr<DocumentLoader> WebFrame::createDocumentLoader(const ResourceRequest&
 void WebFrame::setMainDocumentError(DocumentLoader*, const ResourceError& error)
 {
     if (d->m_pluginView) {
-        d->m_pluginView->didFail(error);
+        if (d->m_pluginView->status() == PluginStatusLoadedSuccessfully)
+            d->m_pluginView->didFail(error);
         d->m_pluginView = 0;
         d->m_hasSentResponseToPlugin = false;
     }
@@ -2028,7 +2030,7 @@ void WebFrame::committedLoad(DocumentLoader* loader, const char* data, int lengt
     if (!d->m_pluginView)
         receivedData(data, length, textEncoding);
 
-    if (d->m_pluginView) {
+    if (d->m_pluginView && d->m_pluginView->status() == PluginStatusLoadedSuccessfully) {
         if (!d->m_hasSentResponseToPlugin) {
             d->m_pluginView->didReceiveResponse(d->frame->loader()->documentLoader()->response());
             // didReceiveResponse sets up a new stream to the plug-in. on a full-page plug-in, a failure in
@@ -2366,7 +2368,7 @@ Widget* WebFrame::createPlugin(const IntSize& pluginSize, Element* element, cons
         pluginName = pluginView->plugin()->name();
     if (!pluginName.isNull()) {
         static CFStringRef key = MarshallingHelpers::LPCOLESTRToCFStringRef(WebKitErrorPlugInNameKey);
-        RetainPtr<CFStringRef> str(AdoptCF, mimeType.createCFString());
+        RetainPtr<CFStringRef> str(AdoptCF, pluginName.createCFString());
         CFDictionarySetValue(userInfo.get(), key, str.get());
     }