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

Fix bug # 129794: plug leak due to circular ownership. r=dp sr=ben a=roc+moz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@116379 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjc%netscape.com 2002-03-12 08:00:33 +00:00
parent 86689bb73e
commit ded7901394
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/xpfe/appshell/src/nsWindowMediator.cpp
View File

@ -182,7 +182,7 @@ nsIRDFResource *nsWindowMediator::kNC_Name = NULL;
nsIRDFResource *nsWindowMediator::kNC_URL = NULL;
nsIRDFResource *nsWindowMediator::kNC_KeyIndex = NULL;
PRInt32 nsWindowMediator::gRefCnt;
PRInt32 nsWindowMediator::gRefCnt = 0;
nsIRDFContainer *nsWindowMediator::mContainer = NULL;
nsIRDFDataSource *nsWindowMediator::mInner = NULL;
@ -842,11 +842,36 @@ nsWindowMediator::ConvertISupportsToDOMWindow( nsISupports* inInterface,
// COM
NS_IMPL_ADDREF( nsWindowMediator );
NS_IMPL_RELEASE( nsWindowMediator );
NS_IMPL_QUERY_INTERFACE3(nsWindowMediator, nsIWindowMediator, nsIRDFDataSource, nsIRDFObserver);
NS_IMETHODIMP_(nsrefcnt)
nsWindowMediator::Release()
{
// We need a special implementation of Release() because our mInner
// holds a Circular References back to us.
NS_PRECONDITION(PRInt32(mRefCnt) > 0, "duplicate release");
--gRefCnt;
NS_LOG_RELEASE(this, mRefCnt, "nsWindowMediator");
if (mInner && mRefCnt == 1)
{
nsIRDFDataSource* tmp = mInner;
mInner = nsnull;
NS_IF_RELEASE(tmp);
return(0);
}
else if (mRefCnt == 0)
{
delete this;
return(0);
}
return(mRefCnt);
}
// RDF
nsresult
nsWindowMediator::Init()
@ -938,6 +963,11 @@ nsWindowMediator::GetTarget(nsIRDFResource* source,
PRBool tv,
nsIRDFNode** target)
{
NS_PRECONDITION(target != nsnull, "null ptr");
if (! target)
return(NS_ERROR_NULL_POINTER);
*target = nsnull;
if (property == kNC_KeyIndex)
{
PRInt32 theIndex = 0;