From 986ff71aa7e9b8e8ec985f50da94d0289cf82048 Mon Sep 17 00:00:00 2001
From: "dveditz%cruzio.com"
 <dveditz%cruzio.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 10 Jun 2008 19:50:06 +0000
Subject: [PATCH] bug 436575 prevent Mac OSX 10.5.3 hang by not loading
 VerifiedDownloadPlugin. patch by shaver, r=josh aas, sr=brendan, a=ss

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@252224 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../modules/plugin/base/src/nsPluginsDirDarwin.cpp   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mozilla/modules/plugin/base/src/nsPluginsDirDarwin.cpp b/mozilla/modules/plugin/base/src/nsPluginsDirDarwin.cpp
index 6e9ab821635..65527e65b1b 100644
--- a/mozilla/modules/plugin/base/src/nsPluginsDirDarwin.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginsDirDarwin.cpp
@@ -237,12 +237,22 @@ nsPluginFile::~nsPluginFile() {}
  */
 nsresult nsPluginFile::LoadPlugin(PRLibrary* &outLibrary)
 {
- 	const char* path;
+    const char* path;
 
     if (!mPlugin)
         return NS_ERROR_NULL_POINTER;
 
     nsCAutoString temp;
+    mPlugin->GetNativeLeafName(temp);
+    /*
+     * Don't load the VDP fake plugin, to avoid tripping a bad bug in OS X
+     * 10.5.3 (see bug 436575).
+     */
+    if (!strcmp(temp.get(), "VerifiedDownloadPlugin.plugin")) {
+        NS_WARNING("Preventing load of VerifiedDownloadPlugin.plugin (see bug 436575)");
+        return NS_ERROR_FAILURE;
+    }
+
     mPlugin->GetNativePath(temp);
     path = temp.get();