corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix part of bug 83367 by fixing the crazy 'delete this' case after making a call out which could result in a reference being added. sr=vidur r=waterson,dbradley a=drivers

Browse Source
This commit is contained in:
jband@netscape.com
2001-06-05 00:51:29 +00:00
parent f163e5e1cb
commit 7da0a544b4
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rdf/base/src/nsCompositeDataSource.cpp
View File

@@ -657,18 +657,24 @@ CompositeDataSourceImpl::Release()
return 0;
}
else if (PRInt32(count) == mDataSources.Count()) {
// We must add count+1 here because otherwise the nested releases
// We must add 1 here because otherwise the nested releases
// on this object will enter this same code path.
PR_AtomicAdd(NS_REINTERPRET_CAST(PRInt32 *, &mRefCnt), count+1);
for (PRInt32 i = mDataSources.Count() - 1; i >= 0; --i) {
PR_AtomicIncrement(NS_REINTERPRET_CAST(PRInt32 *, &mRefCnt));
PRInt32 dsCount;
while (0 != (dsCount = mDataSources.Count())) {
nsIRDFDataSource* ds =
NS_STATIC_CAST(nsIRDFDataSource*, mDataSources[i]);
NS_STATIC_CAST(nsIRDFDataSource*, mDataSources[dsCount-1]);
mDataSources.RemoveElementAt(dsCount-1);
ds->RemoveObserver(this);
NS_RELEASE(ds);
}
NS_LOG_RELEASE(this, 0, "CompositeDataSourceImpl");
NS_DELETEXPCOM(this);
return 0;
// Nest into Release to deal with the one last reference we added above.
// We don't want to assume that we can 'delete this' because an
// extra reference might have been added by other code while we were
// calling out.
NS_ASSERTION(mRefCnt >= 1, "bad mRefCnt");
return Release();
}
else {
NS_LOG_RELEASE(this, count, "CompositeDataSourceImpl");