From adf2c05ade47acc7f32fc6bea41bde6c170ad30e Mon Sep 17 00:00:00 2001
From: "av%netscape.com" <av%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 18 Aug 2000 21:53:03 +0000
Subject: [PATCH] Addressing #48856, added argument null-check before passing
 it to nsCStringKey::nsCStringKey() patch by warren, r=av

git-svn-id: svn://10.0.0.236/trunk@76654 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp | 2 +-
 mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index dbbbbf2beba..3f684e811a6 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -171,7 +171,7 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
   if (nsnull == mimeTypesSeen) {
     mimeTypesSeen = new nsHashtable(NS_MIME_TYPES_HASH_NUM);
   }
-  if (nsnull != mimeTypesSeen){
+  if ((mimeTypesSeen != nsnull) && (mimeType != nsnull)) {
     nsCStringKey key(mimeType);
     // if we've seen this mimetype before
     if (mimeTypesSeen->Get(&key)) {
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index dbbbbf2beba..3f684e811a6 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -171,7 +171,7 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
   if (nsnull == mimeTypesSeen) {
     mimeTypesSeen = new nsHashtable(NS_MIME_TYPES_HASH_NUM);
   }
-  if (nsnull != mimeTypesSeen){
+  if ((mimeTypesSeen != nsnull) && (mimeType != nsnull)) {
     nsCStringKey key(mimeType);
     // if we've seen this mimetype before
     if (mimeTypesSeen->Get(&key)) {