зеркало из https://github.com/mozilla/gecko-dev.git
Fix for bug 84544. Check for null pointer to avoid crash. R=varada, SR=mscott, A=asa
This commit is contained in:
Родитель
c9c27b3e59
Коммит
a4f3f86b7d
|
@ -819,6 +819,8 @@ NS_IMETHODIMP nsMsgFilePostHelper::OnStartRequest(nsIRequest * aChannel, nsISupp
|
|||
|
||||
NS_IMETHODIMP nsMsgFilePostHelper::OnStopRequest(nsIRequest * aChannel, nsISupports *ctxt, nsresult aStatus)
|
||||
{
|
||||
if (!mProtInstance) return NS_OK;
|
||||
|
||||
if (!mSuspendedPostFileRead)
|
||||
mProtInstance->PostDataFinished();
|
||||
|
||||
|
|
|
@ -224,10 +224,12 @@ NS_IMETHODIMP nsMsgComposeAndSend::GetDefaultPrompt(nsIPrompt ** aPrompt)
|
|||
/* If we cannot find a prompter, try the mail3Pane window */
|
||||
nsCOMPtr<nsIMsgWindow> msgWindow;
|
||||
nsCOMPtr <nsIMsgMailSession> mailSession (do_GetService(kMsgMailSessionCID));
|
||||
if (mailSession)
|
||||
{
|
||||
mailSession->GetTopmostMsgWindow(getter_AddRefs(msgWindow));
|
||||
|
||||
if (msgWindow)
|
||||
rv = msgWindow->GetPromptDialog(aPrompt);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче