From 2fd391f6224002f8e85cfb10a92a844569f274ed Mon Sep 17 00:00:00 2001 From: "bienvenu%netscape.com" Date: Tue, 3 Sep 2002 23:27:56 +0000 Subject: [PATCH] fix crash getting new mail when rules.dat has incorrect host name, r=naving, sr=sspitzer 149059 git-svn-id: svn://10.0.0.236/trunk@128765 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/imap/src/nsImapMailFolder.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp index 86c072029dd..622a71a9c23 100644 --- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp @@ -5177,7 +5177,7 @@ PRBool nsMsgIMAPFolderACL::SetFolderRightsForUser(const char *userName, const ch } if (ourUserName && - (!strcmp(ourUserName, myUserName.get()) || !strcmp(ourUserName, IMAP_ACL_ANYONE_STRING))) + (myUserName.Equals(ourUserName) || !strcmp(ourUserName, IMAP_ACL_ANYONE_STRING))) { // if this is setting an ACL for me, cache it in the folder pref flags UpdateACLCache(); @@ -5188,6 +5188,9 @@ PRBool nsMsgIMAPFolderACL::SetFolderRightsForUser(const char *userName, const ch const char *nsMsgIMAPFolderACL::GetRightsStringForUser(const char *inUserName) { + if (!inUserName) + return nsnull; + nsXPIDLCString userName; userName.Assign(inUserName); if (!userName.Length())