Fixing bug 111383 -- crash on start up when there is a plugin with missing mime description string, r=peterl, sr=attinasi

This commit is contained in:
av%netscape.com 2001-12-07 00:42:33 +00:00
Родитель d48e37c68f
Коммит e767b91f71
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -2901,7 +2901,7 @@ NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
registry->SetStringUTF8(key, kPluginsMimeTypeKey, aMimeTypes[i]);
if(aMimeDescriptions[i])
if(aMimeDescriptions && aMimeDescriptions[i])
registry->SetBytesUTF8(key, kPluginsMimeDescKey,
nsCRT::strlen(aMimeDescriptions[i]) + 1,
(PRUint8 *)aMimeDescriptions[i]);
@ -4928,7 +4928,7 @@ AddPluginInfoToRegistry(nsIRegistry* registry, nsRegistryKey top,
break;
registry->SetStringUTF8(mimetypeKey, kPluginsMimeTypeKey, tag->mMimeTypeArray[i]);
if(tag->mMimeDescriptionArray[i])
if(tag->mMimeDescriptionArray && tag->mMimeDescriptionArray[i])
registry->SetBytesUTF8(mimetypeKey, kPluginsMimeDescKey,
nsCRT::strlen(tag->mMimeDescriptionArray[i]) + 1,
(PRUint8 *)tag->mMimeDescriptionArray[i]);