From b24823cbbdfb6339548cedd88bfa7f0f8de65ca2 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Sat, 25 Mar 2000 20:41:26 +0000 Subject: [PATCH] fix for #33310 - weakref leaks r=bruce thanks to beard for finding this broken pattern --- mailnews/base/util/nsMessage.cpp | 2 +- mailnews/base/util/nsMsgFolder.cpp | 5 +++-- mailnews/base/util/nsMsgIdentity.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mailnews/base/util/nsMessage.cpp b/mailnews/base/util/nsMessage.cpp index dce2e1c3c6ad..ed6758c05343 100644 --- a/mailnews/base/util/nsMessage.cpp +++ b/mailnews/base/util/nsMessage.cpp @@ -539,7 +539,7 @@ NS_IMETHODIMP nsMessage::GetMsgFolder(nsIMsgFolder **aFolder) NS_IMETHODIMP nsMessage::SetMsgFolder(nsIMsgFolder *folder) { - mFolder = NS_GetWeakReference(folder); + mFolder = getter_AddRefs(NS_GetWeakReference(folder)); return NS_OK; } diff --git a/mailnews/base/util/nsMsgFolder.cpp b/mailnews/base/util/nsMsgFolder.cpp index 438fef08cda4..80a4ee94a7d5 100644 --- a/mailnews/base/util/nsMsgFolder.cpp +++ b/mailnews/base/util/nsMsgFolder.cpp @@ -349,7 +349,8 @@ NS_IMETHODIMP nsMsgFolder::RemoveFolderListener(nsIFolderListener * listener) NS_IMETHODIMP nsMsgFolder::SetParent(nsIFolder *aParent) { - mParent = NS_GetWeakReference(aParent); + mParent = getter_AddRefs(NS_GetWeakReference(aParent)); + return NS_OK; } @@ -556,7 +557,7 @@ nsMsgFolder::parseURI(PRBool needServer) } - mServer = NS_GetWeakReference(server); + mServer = getter_AddRefs(NS_GetWeakReference(server)); } /* !mServer */ diff --git a/mailnews/base/util/nsMsgIdentity.cpp b/mailnews/base/util/nsMsgIdentity.cpp index 89c6599bb34a..fc218a627573 100644 --- a/mailnews/base/util/nsMsgIdentity.cpp +++ b/mailnews/base/util/nsMsgIdentity.cpp @@ -441,7 +441,7 @@ nsMsgIdentity::SetSmtpServer(nsISmtpServer *aServer) { nsresult rv; - m_smtpServer = NS_GetWeakReference(aServer, &rv); + m_smtpServer = getter_AddRefs(NS_GetWeakReference(aServer, &rv)); if (aServer) { nsXPIDLCString smtpServerKey;