From a4f3f86b7ddc68dca21c1f04844e78006cbe1765 Mon Sep 17 00:00:00 2001
From: "ducarroz%netscape.com" <ducarroz%netscape.com>
Date: Tue, 19 Jun 2001 23:19:55 +0000
Subject: [PATCH] Fix for bug 84544. Check for null pointer to avoid crash.
 R=varada, SR=mscott, A=asa

---
 mailnews/base/util/nsMsgProtocol.cpp | 2 ++
 mailnews/compose/src/nsMsgSend.cpp   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mailnews/base/util/nsMsgProtocol.cpp b/mailnews/base/util/nsMsgProtocol.cpp
index 91664fd37fac..f59b9554e5d8 100644
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -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();
 
diff --git a/mailnews/compose/src/nsMsgSend.cpp b/mailnews/compose/src/nsMsgSend.cpp
index 6d14d0566908..c709f4fba13b 100644
--- a/mailnews/compose/src/nsMsgSend.cpp
+++ b/mailnews/compose/src/nsMsgSend.cpp
@@ -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;
 }