Title: [134996] tags/Safari-537.19/Source/WebCore
- Revision
- 134996
- Author
- lforsch...@apple.com
- Date
- 2012-11-16 13:40:18 -0800 (Fri, 16 Nov 2012)
Log Message
Merged r134903. <rdar://problem/12683850>
Modified Paths
Diff
Modified: tags/Safari-537.19/Source/WebCore/ChangeLog (134995 => 134996)
--- tags/Safari-537.19/Source/WebCore/ChangeLog 2012-11-16 21:39:26 UTC (rev 134995)
+++ tags/Safari-537.19/Source/WebCore/ChangeLog 2012-11-16 21:40:18 UTC (rev 134996)
@@ -1,3 +1,19 @@
+2012-11-16 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r134903
+
+ 2012-11-15 Jer Noble <jer.no...@apple.com>
+
+ Crash at WebCore::PluginData::pluginFileForMimeType const + 38
+ https://bugs.webkit.org/show_bug.cgi?id=102454
+
+ Reviewed by Dan Bernstein.
+
+ NULL-check the return value of Page::pluginData().
+
+ * loader/SubframeLoader.cpp:
+ (WebCore::logPluginRequest):
+
2012-11-15 Xingnan Wang <xingnan.w...@intel.com>
Optimize the multiply-add in Biquad.cpp::process
Modified: tags/Safari-537.19/Source/WebCore/loader/SubframeLoader.cpp (134995 => 134996)
--- tags/Safari-537.19/Source/WebCore/loader/SubframeLoader.cpp 2012-11-16 21:39:26 UTC (rev 134995)
+++ tags/Safari-537.19/Source/WebCore/loader/SubframeLoader.cpp 2012-11-16 21:40:18 UTC (rev 134996)
@@ -198,7 +198,8 @@
return;
}
- String pluginFile = page->pluginData()->pluginFileForMimeType(newMIMEType);
+ PluginData* pluginData = page->pluginData();
+ String pluginFile = pluginData ? pluginData->pluginFileForMimeType(newMIMEType) : String();
String description = !pluginFile ? newMIMEType : pluginFile;
ChromeClient* client = page->chrome()->client();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
