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

Fix leaks from nsDocument::mPrincipal by making it an nsCOMPtr. b=170201 r=mstoltz sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@130316 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu
2002-09-24 01:27:44 +00:00
parent 63df630ac9
commit c2de335afb
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/content/xml/document/src/nsXMLDocument.cpp
View File

@@ -394,14 +394,13 @@ nsXMLDocument::Load(const nsAString& aUrl)
// Partial Reset, need to restore principal for security reasons and
// event listener manager so that load listeners etc. will remain.
nsCOMPtr<nsIPrincipal> principal(dont_QueryInterface(mPrincipal));
nsCOMPtr<nsIEventListenerManager> elm(dont_QueryInterface(mListenerManager));
nsCOMPtr<nsIPrincipal> principal = mPrincipal;
nsCOMPtr<nsIEventListenerManager> elm = mListenerManager;
Reset(nsnull, nsnull);
mPrincipal = principal;
mListenerManager = elm;
NS_IF_ADDREF(mPrincipal);
NS_IF_ADDREF(mListenerManager);
SetDocumentURL(uri);
@@ -433,15 +432,15 @@ nsXMLDocument::Load(const nsAString& aUrl)
if (NS_FAILED(rv)) return rv;
// Set a principal for this document
NS_IF_RELEASE(mPrincipal);
mPrincipal = nsnull;
nsCOMPtr<nsISupports> channelOwner;
rv = channel->GetOwner(getter_AddRefs(channelOwner));
if (NS_SUCCEEDED(rv) && channelOwner)
rv = channelOwner->QueryInterface(NS_GET_IID(nsIPrincipal), (void**)&mPrincipal);
mPrincipal = do_QueryInterface(channelOwner, &rv);
if (NS_FAILED(rv) || !channelOwner)
{
rv = secMan->GetCodebasePrincipal(uri, &mPrincipal);
rv = secMan->GetCodebasePrincipal(uri, getter_AddRefs(mPrincipal));
if (!mPrincipal) return rv;
}