Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 03:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

106160. r=sspitzer sr=bienvenu fix a crash on reading local messages, the fix is not to loadURL if we cannot

Browse Source 
get a msgHdr for the message.
This commit is contained in:
naving%netscape.com 2001-10-23 23:41:47 +00:00
parent 8465fb9bac
commit 1436cf66f1
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mailnews/local/src/nsMailboxProtocol.cpp
View File

@ -89,7 +89,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
nsMailboxProtocol::nsMailboxProtocol(nsIURI * aURI)
: nsMsgProtocol(aURI)
{
Initialize(aURI);
m_lineStreamBuffer =nsnull;
// initialize the pr log if it hasn't been initialiezed already
if (!MAILBOX)
@ -166,7 +166,7 @@ nsresult nsMailboxProtocol::OpenFileSocketForReuse(nsIURI * aURL, PRUint32 aStar
}
void nsMailboxProtocol::Initialize(nsIURI * aURL)
nsresult nsMailboxProtocol::Initialize(nsIURI * aURL)
{
NS_PRECONDITION(aURL, "invalid URL passed into MAILBOX Protocol");
nsresult rv = NS_OK;
@ -190,14 +190,14 @@ void nsMailboxProtocol::Initialize(nsIURI * aURL)
else
{
// we need to specify a byte range to read in so we read in JUST the message we want.
SetupMessageExtraction();
nsMsgKey aMsgKey;
PRUint32 aMsgSize = 0;
rv = m_runningUrl->GetMessageKey(&aMsgKey);
NS_ASSERTION(NS_SUCCEEDED(rv), "oops....i messed something up");
rv = m_runningUrl->GetMessageSize(&aMsgSize);
NS_ASSERTION(NS_SUCCEEDED(rv), "oops....i messed something up");
rv=SetupMessageExtraction();
if (NS_FAILED(rv)) return rv;
nsMsgKey aMsgKey;
PRUint32 aMsgSize = 0;
rv = m_runningUrl->GetMessageKey(&aMsgKey);
NS_ASSERTION(NS_SUCCEEDED(rv), "oops....i messed something up");
rv = m_runningUrl->GetMessageSize(&aMsgSize);
NS_ASSERTION(NS_SUCCEEDED(rv), "oops....i messed something up");
if (RunningMultipleMsgUrl())
{
rv = OpenFileSocketForReuse(aURL, (PRUint32) aMsgKey, aMsgSize);
@ -206,9 +206,9 @@ void nsMailboxProtocol::Initialize(nsIURI * aURL)
mProgressEventSink = nsnull;
}
else
rv = OpenFileSocket(aURL, (PRUint32) aMsgKey, aMsgSize);
NS_ASSERTION(NS_SUCCEEDED(rv), "oops....i messed something up");
}
rv = OpenFileSocket(aURL, (PRUint32) aMsgKey, aMsgSize);
NS_ASSERTION(NS_SUCCEEDED(rv), "oops....i messed something up");
}
}
}
@ -219,6 +219,7 @@ void nsMailboxProtocol::Initialize(nsIURI * aURL)
mCurrentProgress = 0;
NS_NewFileSpecWithSpec(m_tempMsgFileSpec, getter_AddRefs(m_tempMessageFile));
return rv;
}
/////////////////////////////////////////////////////////////////////////////////////////////
@ -369,16 +370,14 @@ PRInt32 nsMailboxProtocol::DoneReadingMessage()
{
// now mark the message as read
nsCOMPtr<nsIMsgDBHdr> msgHdr;
rv = m_runningUrl->GetMessageHeader(getter_AddRefs(msgHdr));
if (m_runningUrl)
rv = m_runningUrl->GetMessageHeader(getter_AddRefs(msgHdr));
NS_ASSERTION(msgHdr, "no msg hdr!");
if (!msgHdr) return NS_ERROR_UNEXPECTED;
PRBool isRead;
msgHdr->GetIsRead(&isRead);
if (NS_SUCCEEDED(rv) && !isRead)
{
NS_ASSERTION(msgHdr, "no msg hdr!");
if (!msgHdr) return NS_ERROR_UNEXPECTED;
if (NS_SUCCEEDED(rv) && !isRead)
msgHdr->MarkRead(PR_TRUE);
}
}
return rv;

5
mailnews/local/src/nsMailboxProtocol.h
View File

@ -83,6 +83,9 @@ public:
nsMailboxProtocol(nsIURI * aURL);
virtual ~nsMailboxProtocol();
// initialization function given a new url and transport layer
nsresult Initialize(nsIURI * aURL);
// the consumer of the url might be something like an nsIDocShell....
virtual nsresult LoadUrl(nsIURI * aURL, nsISupports * aConsumer);
@ -123,8 +126,6 @@ private:
PRUint32 sourceOffset, PRUint32 length);
virtual nsresult CloseSocket();
// initialization function given a new url and transport layer
void Initialize(nsIURI * aURL);
PRInt32 SetupMessageExtraction();
nsresult OpenFileSocketForReuse(nsIURI * aURL, PRUint32 aStartPosition, PRInt32 aReadCount);
PRBool RunningMultipleMsgUrl();

12
mailnews/local/src/nsMailboxService.cpp
View File

@ -328,6 +328,12 @@ nsresult nsMailboxService::RunMailboxUrl(nsIURI * aMailboxUrl, nsISupports * aDi
if (protocol)
{
rv = protocol->Initialize(aMailboxUrl);
if (NS_FAILED(rv))
{
delete protocol;
return rv;
}
NS_ADDREF(protocol);
rv = protocol->LoadUrl(aMailboxUrl, aDisplayConsumer);
NS_RELEASE(protocol); // after loading, someone else will have a ref cnt on the mailbox
@ -525,6 +531,12 @@ NS_IMETHODIMP nsMailboxService::NewChannel(nsIURI *aURI, nsIChannel **_retval)
nsMailboxProtocol * protocol = new nsMailboxProtocol(aURI);
if (protocol)
{
rv = protocol->Initialize(aURI);
if (NS_FAILED(rv))
{
delete protocol;
return rv;
}
rv = protocol->QueryInterface(NS_GET_IID(nsIChannel), (void **) _retval);
}
else