From cab8e013a0859dfc842619f903772f42bd204abc Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Fri, 16 Apr 1999 18:44:53 +0000
Subject: [PATCH] bulletproof the nsMsgAccount object

---
 mailnews/base/src/nsMsgAccount.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mailnews/base/src/nsMsgAccount.cpp b/mailnews/base/src/nsMsgAccount.cpp
index a0f4de7533c2..664eb7eba58f 100644
--- a/mailnews/base/src/nsMsgAccount.cpp
+++ b/mailnews/base/src/nsMsgAccount.cpp
@@ -95,6 +95,9 @@ nsMsgAccount::GetIncomingServer(nsIMsgIncomingServer * *aIncomingServer)
 {
   if (!aIncomingServer) return NS_ERROR_NULL_POINTER;
   nsresult rv;
+
+  // need to call SetKey() first!
+  if (!m_accountKey) return NS_ERROR_NOT_INITIALIZED;
   
   // create the incoming server lazily
   if (!m_incomingServer) {
@@ -110,6 +113,9 @@ nsMsgAccount::GetIncomingServer(nsIMsgIncomingServer * *aIncomingServer)
     char *serverKey;
     rv = m_prefs->CopyCharPref(serverKeyPref, &serverKey);
     PR_FREEIF(serverKeyPref);
+
+    // the server pref doesn't exist
+    if (NS_FAILED(rv)) return NS_ERROR_NOT_INITIALIZED;
     
 #ifdef DEBUG_alecf
     printf("\t%s's server: %s\n", m_accountKey, serverKey);
@@ -122,6 +128,9 @@ nsMsgAccount::GetIncomingServer(nsIMsgIncomingServer * *aIncomingServer)
     char *serverType;
     rv = m_prefs->CopyCharPref(serverTypePref, &serverType);
     PR_FREEIF(serverTypePref);
+
+    // the server type doesn't exist!
+    if (NS_FAILED(rv)) return NS_ERROR_NOT_INITIALIZED;
     
 #ifdef DEBUG_alecf
     if (NS_FAILED(rv)) {