Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing up GetOwner method to not crash on startup.

Browse Source
This commit is contained in:
warren%netscape.com 2000-08-24 07:36:53 +00:00
parent 6ec40e2ae8
commit 1325ceb6a7
4 changed files with 66 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
modules/libjar/nsJARChannel.cpp
View File

@ -835,6 +835,9 @@ nsJARChannel::GetOwner(nsISupports* *aOwner)
nsresult rv;
if (mOwner == nsnull) {
//-- Verify signature, if one is present, and set owner accordingly
rv = EnsureZipReader();
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIPrincipal> certificate;
rv = mJAR->GetCertificatePrincipal(mJAREntry,
getter_AddRefs(certificate));
@ -891,6 +894,7 @@ nsJARChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
*aSecurityInfo = nsnull;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////
// nsIStreamObserver methods:
@ -947,25 +951,39 @@ nsJARChannel::OnDataAvailable(nsIChannel* jarCacheTransport,
////////////////////////////////////////////////////////////////////////////////
// nsIStreamIO methods:
nsresult
nsJARChannel::EnsureZipReader()
{
if (mJAR == nsnull) {
nsresult rv;
if (mJARBaseFile == nsnull)
return NS_ERROR_FAILURE;
// NS_ASSERTION(mJARBaseFile, "mJARBaseFile is null");
nsCOMPtr<nsIFile> fs;
rv = mJARBaseFile->GetFile(getter_AddRefs(fs));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIZipReaderCache> jarCache;
rv = mJARProtocolHandler->GetJARCache(getter_AddRefs(jarCache));
if (NS_FAILED(rv)) return rv;
rv = jarCache->GetZip(fs, getter_AddRefs(mJAR));
if (NS_FAILED(rv)) return rv;
}
return NS_OK;
}
NS_IMETHODIMP
nsJARChannel::Open(char* *contentType, PRInt32 *contentLength)
{
nsresult rv;
NS_ASSERTION(mJARBaseFile, "mJARBaseFile is null");
nsCOMPtr<nsIFile> fs;
rv = mJARBaseFile->GetFile(getter_AddRefs(fs));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIZipReaderCache> jarCache;
rv = mJARProtocolHandler->GetJARCache(getter_AddRefs(jarCache));
if (NS_FAILED(rv)) return rv;
rv = jarCache->GetZip(fs, getter_AddRefs(mJAR));
if (NS_FAILED(rv)) return rv;
nsresult rv;
rv = EnsureZipReader();
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIZipEntry> entry;
rv = mJAR->GetEntry(mJAREntry, getter_AddRefs(entry));
rv = mJAR->GetEntry(mJAREntry, getter_AddRefs(entry));
if (NS_FAILED(rv)) return rv;
if (contentLength) {
@ -980,7 +998,6 @@ nsJARChannel::Open(char* *contentType, PRInt32 *contentLength)
return rv;
}
NS_IMETHODIMP
nsJARChannel::Close(nsresult status)
{

1
modules/libjar/nsJARChannel.h
View File

@ -78,6 +78,7 @@ public:
void* closure);
nsresult AsyncReadJARElement();
nsresult GetCacheFile(nsIFile* *cacheFile);
nsresult EnsureZipReader();
friend class nsJARDownloadObserver;

47
netwerk/protocol/jar/src/nsJARChannel.cpp
View File

@ -835,6 +835,9 @@ nsJARChannel::GetOwner(nsISupports* *aOwner)
nsresult rv;
if (mOwner == nsnull) {
//-- Verify signature, if one is present, and set owner accordingly
rv = EnsureZipReader();
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIPrincipal> certificate;
rv = mJAR->GetCertificatePrincipal(mJAREntry,
getter_AddRefs(certificate));
@ -891,6 +894,7 @@ nsJARChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
*aSecurityInfo = nsnull;
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////
// nsIStreamObserver methods:
@ -947,25 +951,39 @@ nsJARChannel::OnDataAvailable(nsIChannel* jarCacheTransport,
////////////////////////////////////////////////////////////////////////////////
// nsIStreamIO methods:
nsresult
nsJARChannel::EnsureZipReader()
{
if (mJAR == nsnull) {
nsresult rv;
if (mJARBaseFile == nsnull)
return NS_ERROR_FAILURE;
// NS_ASSERTION(mJARBaseFile, "mJARBaseFile is null");
nsCOMPtr<nsIFile> fs;
rv = mJARBaseFile->GetFile(getter_AddRefs(fs));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIZipReaderCache> jarCache;
rv = mJARProtocolHandler->GetJARCache(getter_AddRefs(jarCache));
if (NS_FAILED(rv)) return rv;
rv = jarCache->GetZip(fs, getter_AddRefs(mJAR));
if (NS_FAILED(rv)) return rv;
}
return NS_OK;
}
NS_IMETHODIMP
nsJARChannel::Open(char* *contentType, PRInt32 *contentLength)
{
nsresult rv;
NS_ASSERTION(mJARBaseFile, "mJARBaseFile is null");
nsCOMPtr<nsIFile> fs;
rv = mJARBaseFile->GetFile(getter_AddRefs(fs));
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIZipReaderCache> jarCache;
rv = mJARProtocolHandler->GetJARCache(getter_AddRefs(jarCache));
if (NS_FAILED(rv)) return rv;
rv = jarCache->GetZip(fs, getter_AddRefs(mJAR));
if (NS_FAILED(rv)) return rv;
nsresult rv;
rv = EnsureZipReader();
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIZipEntry> entry;
rv = mJAR->GetEntry(mJAREntry, getter_AddRefs(entry));
rv = mJAR->GetEntry(mJAREntry, getter_AddRefs(entry));
if (NS_FAILED(rv)) return rv;
if (contentLength) {
@ -980,7 +998,6 @@ nsJARChannel::Open(char* *contentType, PRInt32 *contentLength)
return rv;
}
NS_IMETHODIMP
nsJARChannel::Close(nsresult status)
{

1
netwerk/protocol/jar/src/nsJARChannel.h
View File

@ -78,6 +78,7 @@ public:
void* closure);
nsresult AsyncReadJARElement();
nsresult GetCacheFile(nsIFile* *cacheFile);
nsresult EnsureZipReader();
friend class nsJARDownloadObserver;