From 0d53c393d3594377fdbe8d387793f4dec259500d Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Wed, 29 Mar 2000 23:58:42 +0000 Subject: [PATCH] Fix for 33536, r=serge git-svn-id: svn://10.0.0.236/trunk@64525 18797224-902f-48f8-a5cc-f745e15eee43 --- .../plugin/base/src/nsPluginHostImpl.cpp | 22 +++++++++++++------ .../plugin/nglsrc/nsPluginHostImpl.cpp | 22 +++++++++++++------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index f90b59401fe..6b8dd7c4a20 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -153,17 +153,25 @@ nsPluginTag::nsPluginTag(nsPluginInfo* aPluginInfo) mExtensions = new_str(aPluginInfo->fExtensions); mVariants = aPluginInfo->fVariantCount; - mMimeTypeArray = new char*[mVariants]; - mMimeDescriptionArray = new char*[mVariants]; - mExtensionsArray = new char*[mVariants]; - - if(mMimeTypeArray && mMimeDescriptionArray && mExtensionsArray) + mMimeTypeArray = new char*[mVariants]; + if(aPluginInfo->fMimeTypeArray != nsnull) { - for (int i = 0; i < mVariants; i++) { + for (int i = 0; i < mVariants; i++) mMimeTypeArray[i] = new_str(aPluginInfo->fMimeTypeArray[i]); + } + + mMimeDescriptionArray = new char*[mVariants]; + if(aPluginInfo->fMimeDescriptionArray != nsnull) + { + for (int i = 0; i < mVariants; i++) mMimeDescriptionArray[i] = new_str(aPluginInfo->fMimeDescriptionArray[i]); + } + + mExtensionsArray = new char*[mVariants]; + if(aPluginInfo->fExtensionArray != nsnull) + { + for (int i = 0; i < mVariants; i++) mExtensionsArray[i] = new_str(aPluginInfo->fExtensionArray[i]); - } } mFileName = new_str(aPluginInfo->fFileName); diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index f90b59401fe..6b8dd7c4a20 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -153,17 +153,25 @@ nsPluginTag::nsPluginTag(nsPluginInfo* aPluginInfo) mExtensions = new_str(aPluginInfo->fExtensions); mVariants = aPluginInfo->fVariantCount; - mMimeTypeArray = new char*[mVariants]; - mMimeDescriptionArray = new char*[mVariants]; - mExtensionsArray = new char*[mVariants]; - - if(mMimeTypeArray && mMimeDescriptionArray && mExtensionsArray) + mMimeTypeArray = new char*[mVariants]; + if(aPluginInfo->fMimeTypeArray != nsnull) { - for (int i = 0; i < mVariants; i++) { + for (int i = 0; i < mVariants; i++) mMimeTypeArray[i] = new_str(aPluginInfo->fMimeTypeArray[i]); + } + + mMimeDescriptionArray = new char*[mVariants]; + if(aPluginInfo->fMimeDescriptionArray != nsnull) + { + for (int i = 0; i < mVariants; i++) mMimeDescriptionArray[i] = new_str(aPluginInfo->fMimeDescriptionArray[i]); + } + + mExtensionsArray = new char*[mVariants]; + if(aPluginInfo->fExtensionArray != nsnull) + { + for (int i = 0; i < mVariants; i++) mExtensionsArray[i] = new_str(aPluginInfo->fExtensionArray[i]); - } } mFileName = new_str(aPluginInfo->fFileName);