Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 148889 -- unloading XPConnected plugin DLLs may cause crash [ViewPoint], r=peterl, sr=beard

Browse Source
This commit is contained in:
av%netscape.com 2002-06-26 04:32:49 +00:00
parent 35a797fb3e
commit 3df19aa5dc
2 changed files with 61 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -468,11 +468,7 @@ void nsActivePluginList::shut()
for(nsActivePlugin * plugin = mFirst; plugin != nsnull;)
{
nsActivePlugin * next = plugin->mNext;
PRBool unloadLibLater = PR_FALSE;
remove(plugin, &unloadLibLater);
NS_ASSERTION(!unloadLibLater, "Plugin doesn't want to be unloaded");
remove(plugin);
plugin = next;
}
mFirst = nsnull;
@ -519,7 +515,7 @@ PRBool nsActivePluginList::IsLastInstance(nsActivePlugin * plugin)
////////////////////////////////////////////////////////////////////////
PRBool nsActivePluginList::remove(nsActivePlugin * plugin, PRBool * aUnloadLibraryLater)
PRBool nsActivePluginList::remove(nsActivePlugin * plugin)
{
if(mFirst == nsnull)
return PR_FALSE;
@ -550,19 +546,7 @@ PRBool nsActivePluginList::remove(nsActivePlugin * plugin, PRBool * aUnloadLibra
delete p; // plugin instance is destroyed here
if(pluginTag)
{
// xpconnected plugins from the old world should postpone unloading library
// to avoid crash check, if so add library to the list of unloaded libraries
if(pluginTag->mXPConnected && (pluginTag->mFlags & NS_PLUGIN_FLAG_OLDSCHOOL))
{
pluginTag->mCanUnloadLibrary = PR_FALSE;
if(aUnloadLibraryLater)
*aUnloadLibraryLater = PR_TRUE;
}
pluginTag->TryUnloadPlugin();
}
else
NS_ASSERTION(pluginTag, "pluginTag was not set, plugin not shutdown");
@ -625,12 +609,7 @@ void nsActivePluginList::removeAllStopped()
next = p->mNext;
if(p->mStopped)
{
// we don't care about unloading library problem for
// plugins that are already in the 'stop' state
PRBool unloadLibLater = PR_FALSE;
remove(p, &unloadLibLater);
}
remove(p);
p = next;
}
@ -752,25 +731,10 @@ nsActivePlugin * nsActivePluginList::findOldestStopped()
return res;
}
////////////////////////////////////////////////////////////////////////
nsUnusedLibrary::nsUnusedLibrary(PRLibrary * aLibrary)
{
mLibrary = aLibrary;
}
////////////////////////////////////////////////////////////////////////
nsUnusedLibrary::~nsUnusedLibrary()
{
if(mLibrary)
PostPluginUnloadEvent(mLibrary);
}
////////////////////////////////////////////////////////////////////////
nsPluginTag::nsPluginTag()
{
mPluginHost = nsnull;
mNext = nsnull;
mName = nsnull;
mDescription = nsnull;
@ -804,6 +768,7 @@ inline char* new_str(const char* str)
////////////////////////////////////////////////////////////////////////
nsPluginTag::nsPluginTag(nsPluginTag* aPluginTag)
{
mPluginHost = nsnull;
mNext = nsnull;
mName = new_str(aPluginTag->mName);
mDescription = new_str(aPluginTag->mDescription);
@ -847,6 +812,7 @@ nsPluginTag::nsPluginTag(nsPluginTag* aPluginTag)
////////////////////////////////////////////////////////////////////////
nsPluginTag::nsPluginTag(nsPluginInfo* aPluginInfo)
{
mPluginHost = nsnull;
mNext = nsnull;
mName = new_str(aPluginInfo->fName);
mDescription = new_str(aPluginInfo->fDescription);
@ -916,6 +882,7 @@ nsPluginTag::nsPluginTag(const char* aName,
mXPConnected(PR_FALSE),
mLastModifiedTime(aLastModifiedTime)
{
mPluginHost = nsnull;
mName = new_str(aName);
mDescription = new_str(aDescription);
mFileName = new_str(aFileName);
@ -986,6 +953,11 @@ nsPluginTag::~nsPluginTag()
}
void nsPluginTag::SetHost(nsPluginHostImpl * aHost)
{
mPluginHost = aHost;
}
//----------------------------------------------------------------------
// helper struct for asynchronous handeling of plugin unloading
struct nsPluginUnloadEvent: public PLEvent {
@ -1060,8 +1032,17 @@ void nsPluginTag::TryUnloadPlugin(PRBool aForceShutdown)
// before we unload check if we are allowed to, see bug #61388
// also, never unload an XPCOM plugin library
if (mLibrary && mCanUnloadLibrary && !isXPCOM)
PostPluginUnloadEvent(mLibrary); // unload the plugin asynchronously by posting a PLEvent
if (mLibrary && mCanUnloadLibrary && !isXPCOM) {
// NPAPI plugins can be unloaded now if they don't use XPConnect
if (!mXPConnected)
// unload the plugin asynchronously by posting a PLEvent
PostPluginUnloadEvent(mLibrary);
else {
// add library to the unused library list to handle it later
if (mPluginHost)
mPluginHost->AddUnusedLibrary(mLibrary);
}
}
// we should zero it anyway, it is going to be unloaded by
// CleanUnsedLibraries before we need to call the library
@ -1070,7 +1051,6 @@ void nsPluginTag::TryUnloadPlugin(PRBool aForceShutdown)
mLibrary = nsnull;
}
////////////////////////////////////////////////////////////////////////
PRBool nsPluginTag::Equals(nsPluginTag *aPluginTag)
{
@ -2564,9 +2544,9 @@ nsPluginHostImpl::nsPluginHostImpl()
mPluginsLoaded = PR_FALSE;
mDontShowBadPluginMessage = PR_FALSE;
mIsDestroyed = PR_FALSE;
mUnusedLibraries = nsnull;
mOverrideInternalTypes = PR_FALSE;
mAllowAlienStarHandler = PR_FALSE;
mUnusedLibraries.Clear();
// check to see if pref is set at startup to let plugins take over in
// full page mode for certain image mime types that we handle internally
@ -2685,38 +2665,6 @@ PRBool nsPluginHostImpl::IsRunningPlugin(nsPluginTag * plugin)
return PR_FALSE;
}
////////////////////////////////////////////////////////////////////////
void nsPluginHostImpl::AddToUnusedLibraryList(PRLibrary * aLibrary)
{
NS_ASSERTION(aLibrary, "nsPluginHostImpl::AddToUnusedLibraryList: Nothing to add");
if(!aLibrary)
return;
nsUnusedLibrary * unusedLibrary = new nsUnusedLibrary(aLibrary);
if(unusedLibrary) {
unusedLibrary->mNext = mUnusedLibraries;
mUnusedLibraries = unusedLibrary;
}
}
////////////////////////////////////////////////////////////////////////
// this will unload loaded but no longer needed libs which are
// gathered in mUnusedLibraries list, see bug #61388
void nsPluginHostImpl::CleanUnusedLibraries()
{
if(!mUnusedLibraries)
return;
while (nsnull != mUnusedLibraries) {
nsUnusedLibrary *temp = mUnusedLibraries->mNext;
delete mUnusedLibraries;
mUnusedLibraries = temp;
}
}
////////////////////////////////////////////////////////////////////////
nsresult nsPluginHostImpl::ReloadPlugins(PRBool reloadPages)
{
@ -2746,17 +2694,7 @@ nsresult nsPluginHostImpl::ReloadPlugins(PRBool reloadPages)
return NS_ERROR_PLUGINS_PLUGINSNOTCHANGED;
if(reloadPages) {
// if we have currently running plugins we should set a flag not to
// unload them from memory, see bug #61388
// and form a list of libs to be unloaded later
for(nsPluginTag * p = mPlugins; p != nsnull; p = p->mNext) {
if(IsRunningPlugin(p) && (p->mFlags & NS_PLUGIN_FLAG_OLDSCHOOL)) {
p->mCanUnloadLibrary = PR_FALSE;
AddToUnusedLibraryList(p->mLibrary);
}
}
// then stop any running plugins
// stop any running plugins
mActivePluginList.stopRunning();
}
@ -3348,8 +3286,6 @@ NS_IMETHODIMP nsPluginHostImpl::Destroy(void)
mCachedPlugins = next;
}
CleanUnusedLibraries();
// Lets remove any of the temporary files that we created.
nsCOMPtr<nsIFile> pluginTmp;
nsresult rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(pluginTmp));
@ -3368,6 +3304,14 @@ NS_IMETHODIMP nsPluginHostImpl::Destroy(void)
mPrivateDirServiceProvider = nsnull;
}
// unload any remaining plugin libraries from memory
for (PRInt32 i = 0; i < mUnusedLibraries.Count(); i++) {
PRLibrary * library = (PRLibrary *)mUnusedLibraries[i];
if (library)
PostPluginUnloadEvent(library);
}
mUnusedLibraries.Clear();
return NS_OK;
}
@ -4495,9 +4439,6 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
if(!aMimeType)
return NS_ERROR_ILLEGAL_VALUE;
// unload any libs that can remain after plugins.refresh(1), see #61388
CleanUnusedLibraries();
// If plugins haven't been scanned yet, do so now
LoadPlugins();
@ -4528,6 +4469,10 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
if (pluginFile.LoadPlugin(pluginLibrary) != NS_OK || pluginLibrary == NULL)
return NS_ERROR_FAILURE;
// remove from unused lib list, if it is there
if (mUnusedLibraries.IndexOf(pluginLibrary) > -1)
mUnusedLibraries.RemoveElement(pluginLibrary);
pluginTag->mLibrary = pluginLibrary;
}
@ -4731,6 +4676,7 @@ static nsresult FixUpPluginInfo(nsPluginInfo &aInfo, nsPluginFile &aPluginFile)
return NS_ERROR_FAILURE;
NP_GETMIMEDESCRIPTION pf = (NP_GETMIMEDESCRIPTION)PR_FindSymbol(library, "NP_GetMIMEDescription");
if (pf) {
// if we found it, this is the default plugin, return
char * mimedescription = pf();
@ -4928,6 +4874,7 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
// so if we still want it -- do it
if(bAddIt) {
pluginTag->SetHost(this);
pluginTag->mNext = mPlugins;
mPlugins = pluginTag;
@ -5510,6 +5457,7 @@ nsPluginHostImpl::LoadXPCOMPlugins(nsIComponentManager* aComponentManager, nsIFi
continue;
}
tag->SetHost(this);
tag->mNext = mPlugins;
mPlugins = tag;
@ -5582,6 +5530,8 @@ nsPluginHostImpl::LoadCachedPluginsInfo(nsIRegistry* registry)
if (NS_FAILED(rv))
continue;
tag->SetHost(this);
// Mark plugin as loaded from cache
tag->Mark(NS_PLUGIN_FLAG_FROMCACHE);
PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_BASIC,
@ -5911,11 +5861,7 @@ nsPluginHostImpl::StopPluginInstance(nsIPluginInstance* aInstance)
if(plugin->mPluginTag)
library = plugin->mPluginTag->mLibrary;
PRBool unloadLibLater = PR_FALSE;
mActivePluginList.remove(plugin, &unloadLibLater);
if(unloadLibLater)
AddToUnusedLibraryList(library);
mActivePluginList.remove(plugin);
}
else {
// if it is allowed to be cached simply stop it, but first we should check
@ -5932,12 +5878,7 @@ nsPluginHostImpl::StopPluginInstance(nsIPluginInstance* aInstance)
nsActivePlugin * oldest = mActivePluginList.findOldestStopped();
if(oldest != nsnull) {
PRLibrary * library = oldest->mPluginTag->mLibrary;
PRBool unloadLibLater = PR_FALSE;
mActivePluginList.remove(oldest, &unloadLibLater);
if(unloadLibLater)
AddToUnusedLibraryList(library);
mActivePluginList.remove(oldest);
}
}
}
@ -6590,6 +6531,7 @@ nsPluginHostImpl::ScanForRealInComponentsFolder(nsIComponentManager * aCompManag
if (info.fMimeTypeArray) {
nsPluginTag *pluginTag = new nsPluginTag(&info);
if (pluginTag) {
pluginTag->SetHost(this);
pluginTag->mNext = mPlugins;
mPlugins = pluginTag;
@ -6607,6 +6549,14 @@ nsPluginHostImpl::ScanForRealInComponentsFolder(nsIComponentManager * aCompManag
return rv;
}
nsresult nsPluginHostImpl::AddUnusedLibrary(PRLibrary * aLibrary)
{
if (mUnusedLibraries.IndexOf(aLibrary) == -1) // don't add duplicates
mUnusedLibraries.AppendElement(aLibrary);
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////////
nsresult nsPluginStreamListenerPeer::ServeStreamAsFile(nsIRequest *request,
nsISupports* aContext)

28
modules/plugin/base/src/nsPluginHostImpl.h
View File

@ -60,6 +60,7 @@ class nsIComponentManager;
class nsIFile;
class nsIChannel;
class nsIRegistry;
class nsPluginHostImpl;
/**
* A linked-list of plugin information that is used for
@ -86,11 +87,13 @@ public:
~nsPluginTag();
void SetHost(nsPluginHostImpl * aHost);
void TryUnloadPlugin(PRBool aForceShutdown = PR_FALSE);
void Mark(PRUint32 mask) { mFlags |= mask; }
PRBool Equals(nsPluginTag* aPluginTag);
nsPluginTag *mNext;
nsPluginHostImpl *mPluginHost;
char *mName;
char *mDescription;
PRInt32 mVariants;
@ -142,7 +145,7 @@ public:
void shut();
PRBool add(nsActivePlugin * plugin);
PRBool remove(nsActivePlugin * plugin, PRBool * aUnloadLibraryLater);
PRBool remove(nsActivePlugin * plugin);
nsActivePlugin * find(nsIPluginInstance* instance);
nsActivePlugin * find(const char * mimetype);
nsActivePlugin * findStopped(const char * url);
@ -153,22 +156,6 @@ public:
PRBool IsLastInstance(nsActivePlugin * plugin);
};
// The purpose of this list is to keep track of unloaded plugin libs
// we need to keep some libs in memory when we destroy mPlugins list
// during refresh with reload if the plugin is currently running
// on the page. They should be unloaded later, see bug #61388
// There could also be other reasons to have this list. XPConnected
// plugins e.g. may still be held at the time we normally unload the library
class nsUnusedLibrary
{
public:
nsUnusedLibrary *mNext;
PRLibrary *mLibrary;
nsUnusedLibrary(PRLibrary * aLibrary);
~nsUnusedLibrary();
};
#define NS_PLUGIN_FLAG_ENABLED 0x0001 //is this plugin enabled?
#define NS_PLUGIN_FLAG_OLDSCHOOL 0x0002 //is this a pre-xpcom plugin?
#define NS_PLUGIN_FLAG_FROMCACHE 0x0004 // this plugintag info was loaded from cache
@ -392,6 +379,9 @@ public:
NS_IMETHOD
StopPluginInstance(nsIPluginInstance* aInstance);
NS_IMETHOD
AddUnusedLibrary(PRLibrary * aLibrary);
private:
NS_IMETHOD
TrySetUpPluginInstance(const char *aMimeType, nsIURI *aURL, nsIPluginInstanceOwner *aOwner);
@ -443,8 +433,6 @@ private:
PRBool checkForUnwantedPlugins = PR_FALSE);
PRBool IsRunningPlugin(nsPluginTag * plugin);
void AddToUnusedLibraryList(PRLibrary * aLibrary);
void CleanUnusedLibraries();
// Loads all cached plugins info into mCachedPlugins
nsresult LoadCachedPluginsInfo(nsIRegistry* registry);
@ -483,7 +471,7 @@ private:
PRBool mAllowAlienStarHandler; // set by pref plugin.allow_alien_star_handler
nsActivePluginList mActivePluginList;
nsUnusedLibrary *mUnusedLibraries;
nsVoidArray mUnusedLibraries;
nsCOMPtr<nsIDirectoryServiceProvider> mPrivateDirServiceProvider;
nsWeakPtr mCurrentDocument; // weak reference, we use it to id document only