Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 679819e8236f (bug 1086977) for OSX build bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2014-10-28 15:09:32 -07:00
parent a38e4925b7
commit eac7e8e4cb
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dom/plugins/base/nsPluginsDirDarwin.cpp
View File

@ -474,23 +474,20 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info, PRLibrary **outLibrary)
return NS_OK;
}
// Don't load "fbplugin" or any plugins whose name starts with "fbplugin_"
// (Facebook plugins) if we're running on OS X 10.10 (Yosemite) or later.
// A "fbplugin" file crashes on load, in the call to LoadPlugin() below.
// See bug 1086977.
// Don't load "fbplugin" (a Facebook plugin) if we're running on OS X 10.10
// (Yosemite) or later. It crashes on load, in the call to LoadPlugin()
// below. See bug 1086977.
if (nsCocoaFeatures::OnYosemiteOrLater()) {
if (fileName.EqualsLiteral("fbplugin") ||
StringBeginsWith(fileName, NS_LITERAL_CSTRING("fbplugin_"))) {
NS_WARNING(nsPrintfCString("Preventing load of %s (see bug 1086977)\n",
fileName.get()));
if (fileName.EqualsLiteral("fbplugin")) {
NS_WARNING("Preventing load of fbplugin (see bug 1086977)");
return NS_ERROR_FAILURE;
}
#if defined(MOZ_CRASHREPORTER)
// The block above assumes that "fbplugin" is the filename of the plugin
// to be blocked, or that the filename starts with "fbplugin_". But we
// don't yet know for sure if this is always true. So for the time being
// record extra information in our crash logs.
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Bug_1086977"),
// to be blocked, but be don't yet know for sure if this is true. It might
// also be the name of a file indirectly loaded by the plugin. So for the
// time being we must record extra information in our crash logs.
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Bug 1086977"),
fileName);
#endif
}
@ -505,8 +502,9 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info, PRLibrary **outLibrary)
#if defined(MOZ_CRASHREPORTER)
if (nsCocoaFeatures::OnYosemiteOrLater()) {
// If we didn't crash in LoadPlugin(), change the previous annotation so we
// don't sow confusion.
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Bug_1086977"),
// don't sow confusion. Unfortunately there's not (yet) any way to get rid
// of the annotation completely.
CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Bug 1086977"),
NS_LITERAL_CSTRING("Didn't crash, please ignore"));
}
#endif