wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 494453 - Crash when accessing sessionStorage object from chrome.

Browse Source 
This fixes a crash when accessing sessionStorage from a chrome window due to
NS_InnermostURI getting called with a null URI (namely, the system principals
URI which is null).
r=bz
sr=bz
This commit is contained in:
Shawn Wilsher 2009-05-22 19:08:29 -04:00
parent 8f27a2419e
commit cb8376ea0a
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dom/src/storage/nsDOMStorage.cpp
View File

@ -577,20 +577,40 @@ nsDOMStorage::~nsDOMStorage()
nsDOMStorageManager::gStorageManager->RemoveFromStoragesHash(this);
}
static
nsresult
GetDomainURI(nsIPrincipal *aPrincipal, nsIURI **_domain)
{
nsCOMPtr<nsIURI> uri;
nsresult rv = aPrincipal->GetURI(getter_AddRefs(uri));
NS_ENSURE_SUCCESS(rv, rv);
// Check if we really got any URI. System principal doesn't return a URI
// instance and we would crash in NS_GetInnermostURI below.
if (!uri)
return NS_ERROR_NOT_AVAILABLE;
nsCOMPtr<nsIURI> innerURI = NS_GetInnermostURI(uri);
if (!innerURI)
return NS_ERROR_UNEXPECTED;
innerURI.forget(_domain);
return NS_OK;
}
nsresult
nsDOMStorage::InitAsSessionStorage(nsIPrincipal *aPrincipal)
{
nsresult rv;
nsCOMPtr<nsIURI> uri;
rv = aPrincipal->GetURI(getter_AddRefs(uri));
nsCOMPtr<nsIURI> domainURI;
nsresult rv = GetDomainURI(aPrincipal, getter_AddRefs(domainURI));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> innerUri = NS_GetInnermostURI(uri);
if (!innerUri)
return NS_ERROR_UNEXPECTED;
innerUri->GetAsciiHost(mDomain);
// No need to check for a return value. If this would fail we would not get
// here as we call GetPrincipalURIAndHost (nsDOMStorage.cpp:88) from
// nsDOMStorage::CanUseStorage before we query the storage manager for a new
// sessionStorage. It calls GetAsciiHost on innermost URI. If it fails, we
// won't get to InitAsSessionStorage.
domainURI->GetAsciiHost(mDomain);
#ifdef MOZ_STORAGE
mUseDB = PR_FALSE;
@ -603,31 +623,20 @@ nsDOMStorage::InitAsSessionStorage(nsIPrincipal *aPrincipal)
nsresult
nsDOMStorage::InitAsLocalStorage(nsIPrincipal *aPrincipal)
{
nsresult rv;
nsCOMPtr<nsIURI> uri;
rv = aPrincipal->GetURI(getter_AddRefs(uri));
nsCOMPtr<nsIURI> domainURI;
nsresult rv = GetDomainURI(aPrincipal, getter_AddRefs(domainURI));
NS_ENSURE_SUCCESS(rv, rv);
// Check if we really got any URI. System principal doesn't return a URI
// instance and we would crash in NS_GetInnermostURI bellow.
if (!uri)
return NS_ERROR_NOT_AVAILABLE;
nsCOMPtr<nsIURI> innerUri = NS_GetInnermostURI(uri);
if (!innerUri)
return NS_ERROR_UNEXPECTED;
// No need to check for a return value. If this would fail we would not get
// here as we call GetPrincipalURIAndHost (nsDOMStorage.cpp:88) from
// nsDOMStorage::CanUseStorage before we query the storage manager for a new
// localStorage. It calls GetAsciiHost on innermost URI. If it fails, we won't
// get to InitAsLocalStorage. Actually, mDomain will get replaced with
// mPrincipal in bug 455070. It is not even used for localStorage.
innerUri->GetAsciiHost(mDomain);
domainURI->GetAsciiHost(mDomain);
#ifdef MOZ_STORAGE
nsDOMStorageDBWrapper::CreateOriginScopeDBKey(innerUri, mScopeDBKey);
nsDOMStorageDBWrapper::CreateOriginScopeDBKey(domainURI, mScopeDBKey);
// XXX Bug 357323, we have to solve the issue how to define
// origin for file URLs. In that case CreateOriginScopeDBKey