Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disconnect and release the event listener manager after removing the entry from the hash table to avoid crashes caused re-entry into hash table code. b=334177 r+sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@194624 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2006-04-18 20:59:28 +00:00
parent c7ccf0bf6b
commit 859638354c
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/content/base/src/nsContentUtils.cpp
View File

@@ -203,9 +203,7 @@ public:
~EventListenerManagerMapEntry()
{
if (mListenerManager) {
mListenerManager->Disconnect();
}
NS_ASSERTION(!mListenerManager, "caller must release and disconnect ELM");
}
private:
@@ -2887,8 +2885,20 @@ void
nsContentUtils::RemoveListenerManager(nsIContent *aContent)
{
if (sEventListenerManagersHash.ops) {
PL_DHashTableOperate(&sEventListenerManagersHash, aContent,
PL_DHASH_REMOVE);
EventListenerManagerMapEntry *entry =
NS_STATIC_CAST(EventListenerManagerMapEntry *,
PL_DHashTableOperate(&sEventListenerManagersHash, aContent,
PL_DHASH_LOOKUP));
if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
nsCOMPtr<nsIEventListenerManager> listenerManager;
listenerManager.swap(entry->mListenerManager);
// Remove the entry and *then* do operations that could cause further
// modification of sEventListenerManagersHash. See bug 334177.
PL_DHashTableRawRemove(&sEventListenerManagersHash, entry);
if (listenerManager) {
listenerManager->Disconnect();
}
}
}
}