From 8cfc680f3ee2dc6085603ea0c4ccf25ef2633d25 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Sun, 23 Feb 2003 01:51:37 +0000 Subject: [PATCH] bullet proofing for crasher bug #194335. some additional code clean up (found while reviewing bug #190106. r/sr=bienvenu git-svn-id: svn://10.0.0.236/trunk@138254 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/imap/src/nsImapProtocol.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.cpp b/mozilla/mailnews/imap/src/nsImapProtocol.cpp index 2abdaa5f81a..bd9c869209c 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp +++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp @@ -1405,9 +1405,9 @@ PRBool nsImapProtocol::ProcessCurrentURL() if (m_channelListener) { nsCOMPtr request = do_QueryInterface(m_mockChannel); - if (!request) return NS_ERROR_FAILURE; - - rv = m_channelListener->OnStopRequest(request, m_channelContext, NS_OK); + NS_ASSERTION(request, "no request"); + if (request) + rv = m_channelListener->OnStopRequest(request, m_channelContext, NS_OK); } m_lastActiveTime = PR_Now(); // ** jt -- is this the best place for time stamp SetFlag(IMAP_CLEAN_UP_URL_STATE); @@ -5658,7 +5658,9 @@ PRBool nsImapProtocol::MailboxIsNoSelectMailbox(const char *mailboxName) if (!name) return PR_FALSE; - m_imapServerSink->FolderIsNoSelect(name, &rv); + NS_ASSERTION(m_imapServerSink, "unexpected, no imap server sink, see bug #194335"); + if (m_imapServerSink) + m_imapServerSink->FolderIsNoSelect(name, &rv); PL_strfree(name); return rv;