From 72e1c9fe0ea24fdbedf47b4a9261c164ca1c0c03 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Sat, 22 Nov 2003 21:19:35 +0000 Subject: [PATCH] Flash crashes GTK2 builds due to a bug in Linux dlopen(). Bug 223744, patch by anlan@ida.liu.se (Andreas Lange), r=blizzard, sr=bzbarsky, a=asa --- modules/plugin/base/src/nsPluginsDirUnix.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/plugin/base/src/nsPluginsDirUnix.cpp b/modules/plugin/base/src/nsPluginsDirUnix.cpp index ec2329b2b6c..09f5aeb1243 100644 --- a/modules/plugin/base/src/nsPluginsDirUnix.cpp +++ b/modules/plugin/base/src/nsPluginsDirUnix.cpp @@ -318,8 +318,14 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary) // namespace before attempting to load the plug-in seems to // work fine. - // Lazy resolving might cause crash later (bug 211587) + +#if defined(SOLARIS) || defined(HPUX) + // Acrobat/libXm: Lazy resolving might cause crash later (bug 211587) pLibrary = outLibrary = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW); +#else + // Some dlopen() doesn't recover from a failed PR_LD_NOW (bug 223744) + pLibrary = outLibrary = PR_LoadLibraryWithFlags(libSpec, 0); +#endif if (!pLibrary) { LoadExtraSharedLibs(); // try reload plugin once more @@ -329,7 +335,7 @@ nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary) } #else pLibrary = outLibrary = PR_LoadLibraryWithFlags(libSpec, 0); -#endif +#endif // MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 #ifdef NS_DEBUG printf("LoadPlugin() %s returned %lx\n",