From 4e7faff3247eb5532bd969a77f0a5333c258ddff Mon Sep 17 00:00:00 2001
From: "bienvenu%netscape.com"
 <bienvenu%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 21 Oct 1999 01:42:00 +0000
Subject: [PATCH] fix memory leaks and mismatched frees r=jefft

git-svn-id: svn://10.0.0.236/trunk@51338 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/src/nsMessenger.cpp           | 1 +
 mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp
index ab3324f4e90..5a88ca2cf2e 100644
--- a/mozilla/mailnews/base/src/nsMessenger.cpp
+++ b/mozilla/mailnews/base/src/nsMessenger.cpp
@@ -1688,6 +1688,7 @@ nsMessenger::ForwardMessages(nsIDOMNodeList *domNodeList,
                         if (NS_SUCCEEDED(rv) && pMsgDraft)
                           pMsgDraft->OpenDraftMsg(str.GetUnicode(),
                                                   nsnull, PR_TRUE);
+						nsAllocator::Free(msgUri);
                       }
                   }
               }
diff --git a/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp b/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp
index 508ef6cddb5..c43351d5490 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp
@@ -1152,6 +1152,7 @@ nsresult nsMsgFolderDataSource::DoNewFolder(nsIMsgFolder *folder, nsISupportsArr
 		nsAutoCString nameStr(tempStr);
 
 		rv = folder->CreateSubfolder(nameStr);
+		nsAllocator::Free(name);
 	}
 	return rv;
 }
@@ -1170,7 +1171,7 @@ nsresult nsMsgFolderDataSource::DoFolderAssert(nsIMsgFolder *folder, nsIRDFResou
 			if(NS_SUCCEEDED(rv))
 			{
 				rv = folder->SetCharset(value);
-				delete[] value;
+				nsAllocator::Free(value);
 			}
 		}
 		else