From 29b37211c1adf9163afc13cbdec2a2205a36300e Mon Sep 17 00:00:00 2001
From: "av%netscape.com" <av%netscape.com>
Date: Tue, 4 Sep 2001 23:17:48 +0000
Subject: [PATCH] Fixing bug 86642 -- crash in
 DOMMimeTypeImpl::DOMMimeTypeImpl() when assigning fields missing from the
 plugin version stamp, r=peterl, sr=attinasi

---
 modules/plugin/base/src/nsPluginHostImpl.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp
index 72024512cfb0..404d2bd40f78 100644
--- a/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -3818,9 +3818,14 @@ public:
   DOMMimeTypeImpl(nsPluginTag* aPluginTag, PRUint32 aMimeTypeIndex)
   {
     NS_INIT_ISUPPORTS();
-    mDescription.AssignWithConversion(aPluginTag->mMimeDescriptionArray[aMimeTypeIndex]);
-    mSuffixes.AssignWithConversion(aPluginTag->mExtensionsArray[aMimeTypeIndex]);
-    mType.AssignWithConversion(aPluginTag->mMimeTypeArray[aMimeTypeIndex]);
+    if (aPluginTag) {
+      if (aPluginTag->mMimeDescriptionArray)
+        mDescription.AssignWithConversion(aPluginTag->mMimeDescriptionArray[aMimeTypeIndex]);
+      if (aPluginTag->mExtensionsArray)
+        mSuffixes.AssignWithConversion(aPluginTag->mExtensionsArray[aMimeTypeIndex]);
+      if (aPluginTag->mMimeTypeArray)
+        mType.AssignWithConversion(aPluginTag->mMimeTypeArray[aMimeTypeIndex]);
+    }
   }
   
   virtual ~DOMMimeTypeImpl() {