From 33bd7b7bea4414a6cf5b24f5b6cf710a989165f0 Mon Sep 17 00:00:00 2001
From: "alfred.peng%sun.com"
 <alfred.peng%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 6 Apr 2008 04:38:27 +0000
Subject: [PATCH] Bug 426565. Firefox 3 crashes with Java applets.
 r+sr=jst,a=dsicore.

git-svn-id: svn://10.0.0.236/trunk@249678 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp b/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
index 5260e784a93..f53d522729a 100644
--- a/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
@@ -286,9 +286,12 @@ PRBool nsPluginNativeWindowGtk2::CanGetValueFromPlugin(nsCOMPtr<nsIPluginInstanc
 
           rv = pluginHost->GetPluginFactory("application/x-java-vm", &pluginFactory);
           if (NS_SUCCEEDED(rv) && pluginFactory) {
-            const char * jpiDescription;
+            const char * jpiDescription = NULL;
 
             pluginFactory->GetValue(nsPluginVariable_DescriptionString, (void*)&jpiDescription);
+            if (!jpiDescription)
+              return PR_FALSE;
+
             /** 
              * "Java(TM) Plug-in" is Sun's Java Plugin Trademark,
              * so we are sure that this is Sun 's Java Plugin if