Title: [134999] branches/safari-536.28-branch/Source/WebCore
- Revision
- 134999
- Author
- [email protected]
- Date
- 2012-11-16 13:53:15 -0800 (Fri, 16 Nov 2012)
Log Message
Merged r134903. <rdar://problem/12721103>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (134998 => 134999)
--- branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-16 21:52:25 UTC (rev 134998)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-16 21:53:15 UTC (rev 134999)
@@ -1,3 +1,19 @@
+2012-11-16 Lucas Forschler <[email protected]>
+
+ Merge r134903
+
+ 2012-11-15 Jer Noble <[email protected]>
+
+ 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 Andy Estes <[email protected]>
Merge r130266.
Modified: branches/safari-536.28-branch/Source/WebCore/loader/SubframeLoader.cpp (134998 => 134999)
--- branches/safari-536.28-branch/Source/WebCore/loader/SubframeLoader.cpp 2012-11-16 21:52:25 UTC (rev 134998)
+++ branches/safari-536.28-branch/Source/WebCore/loader/SubframeLoader.cpp 2012-11-16 21:53:15 UTC (rev 134999)
@@ -173,7 +173,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
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
