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

Make the URIs of principals immutable. Bug 339822, r=dveditz, sr=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@200404 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2006-06-20 03:17:41 +00:00
parent 72531d2ff4
commit faa9044fad
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/caps/src/nsNullPrincipal.cpp
View File

@ -248,15 +248,13 @@ nsNullPrincipal::DisableCapability(const char *aCapability, void **aAnnotation)
NS_IMETHODIMP
nsNullPrincipal::GetURI(nsIURI** aURI)
{
NS_ADDREF(*aURI = mURI);
return NS_OK;
return NS_EnsureSafeToReturn(mURI, aURI);
}
NS_IMETHODIMP
nsNullPrincipal::GetDomain(nsIURI** aDomain)
{
NS_ADDREF(*aDomain = mURI);
return NS_OK;
return NS_EnsureSafeToReturn(mURI, aDomain);
}
NS_IMETHODIMP

18
mozilla/caps/src/nsPrincipal.cpp
View File

@ -527,15 +527,18 @@ nsPrincipal::GetHasCertificate(PRBool* aResult)
NS_IMETHODIMP
nsPrincipal::GetURI(nsIURI** aURI)
{
NS_IF_ADDREF(*aURI = mCodebase);
if (!mCodebase) {
*aURI = nsnull;
return NS_OK;
}
return NS_OK;
return NS_EnsureSafeToReturn(mCodebase, aURI);
}
void
nsPrincipal::SetURI(nsIURI* aURI)
{
mCodebase = aURI;
mCodebase = NS_TryToMakeImmutable(aURI);
// Invalidate our cached origin
mOrigin = nsnull;
@ -625,15 +628,18 @@ nsPrincipal::GetHashValue(PRUint32* aValue)
NS_IMETHODIMP
nsPrincipal::GetDomain(nsIURI** aDomain)
{
NS_IF_ADDREF(*aDomain = mDomain);
if (!mDomain) {
*aDomain = nsnull;
return NS_OK;
}
return NS_OK;
return NS_EnsureSafeToReturn(mDomain, aDomain);
}
NS_IMETHODIMP
nsPrincipal::SetDomain(nsIURI* aDomain)
{
mDomain = aDomain;
mDomain = NS_TryToMakeImmutable(aDomain);
// Domain has changed, forget cached security policy
SetSecurityPolicy(nsnull);