From e37205ec16739c030609df32469cc7c2e961bc73 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Sun, 17 Nov 2002 21:58:03 +0000 Subject: [PATCH] 180576 nsPluginHostImpl::RegisterPluginMimeTypesWithLayout doesn't null check loader r=av sr=bz git-svn-id: svn://10.0.0.236/trunk@134019 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 397907782e3..8155d3ab09f 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -3749,9 +3749,14 @@ nsresult nsPluginHostImpl::RegisterPluginMimeTypesWithLayout(nsPluginTag * plugi return rv; nsCOMPtr loader; - if (!mOverrideInternalTypes) + if (!mOverrideInternalTypes) { loader = do_GetService("@mozilla.org/image/loader;1"); - + if (!loader) { + NS_WARNING("get loader failed, falling back to mOverrideInternalTypes") + mOverrideInternalTypes=PR_TRUE; + } + } + for(int i = 0; i < pluginTag->mVariants; i++) { // Do not register any doc loader factory content viewers for mime types we do internally