mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed memory leak when calling GetImapUserName(); the returned string should be freed

This commit is contained in:
jefft%netscape.com 1999-04-14 01:53:16 +00:00
Родитель 91e702a3f7
Коммит 9e9917a4e5
3 изменённых файлов: 65 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

35
mailnews/imap/src/nsImapProtocol.cpp
Просмотреть файл

@ -298,7 +298,7 @@ nsImapProtocol::GetImapHostName()
return hostName;
}
const char*
char*
nsImapProtocol::GetImapUserName()
{
char* userName = nsnull;
@ -2411,9 +2411,11 @@ PRUint32 nsImapProtocol::GetMessageSize(nsString2 &messageId,
sizeInfo->idIsUid = idsAreUids;
nsIMAPNamespace *nsForMailbox = nsnull;
char *userName = GetImapUserName();
m_hostSessionList->GetNamespaceForMailboxForHost(
GetImapHostName(), GetImapUserName(), folderFromParser,
GetImapHostName(), userName, folderFromParser,
nsForMailbox);
PR_FREEIF(userName);
char *nonUTF7ConvertedName = CreateUtf7ConvertedString(folderFromParser, FALSE);
if (nonUTF7ConvertedName)
@ -2554,12 +2556,14 @@ void nsImapProtocol::AddFolderRightsForUser(const char *mailboxName, const char
if (aclRightsInfo)
{
nsIMAPNamespace *namespaceForFolder = nsnull;
char *userName = GetImapUserName();
NS_ASSERTION (m_hostSessionList, "fatal ... null host session list");
if (m_hostSessionList)
m_hostSessionList->GetNamespaceForMailboxForHost(
GetImapHostName(), GetImapUserName(), mailboxName,
GetImapHostName(), userName, mailboxName,
namespaceForFolder);
PR_FREEIF(userName);
aclRightsInfo->hostName = PL_strdup(GetImapHostName());
char *nonUTF7ConvertedName = CreateUtf7ConvertedString(mailboxName, FALSE);
@ -2768,13 +2772,15 @@ nsImapProtocol::DiscoverMailboxSpec(mailbox_spec * adoptedBoxSpec)
{
// IMAP_LoadTrashFolderName(); **** needs to work on localization issues
nsIMAPNamespace *ns;
nsIMAPNamespace *ns = nsnull;
const char* hostName = GetImapHostName();
char *userName = GetImapUserName();
NS_ASSERTION (m_hostSessionList, "fatal null host session list");
if (!m_hostSessionList) return;
m_hostSessionList->GetDefaultNamespaceOfTypeForHost(
GetImapHostName(), GetImapUserName(), kPersonalNamespace, ns);
hostName, userName, kPersonalNamespace, ns);
const char *nsPrefix = ns ? ns->GetPrefix() : 0;
nsString2 canonicalSubDir(eOneByte, 0);
@ -2802,8 +2808,7 @@ nsImapProtocol::DiscoverMailboxSpec(mailbox_spec * adoptedBoxSpec)
PRBool onlineTrashFolderExists = PR_FALSE;
if (m_hostSessionList)
m_hostSessionList->GetOnlineTrashFolderExistsForHost(
GetImapHostName(), GetImapUserName(),
onlineTrashFolderExists);
hostName, userName, onlineTrashFolderExists);
if (GetDeleteIsMoveToTrash() && // don't set the Trash flag if not using the Trash model
!onlineTrashFolderExists &&
@ -2839,8 +2844,7 @@ nsImapProtocol::DiscoverMailboxSpec(mailbox_spec * adoptedBoxSpec)
if (m_hostSessionList)
m_hostSessionList->
SetOnlineTrashFolderExistsForHost(
GetImapHostName(), GetImapUserName(),
trashExists);
hostName, userName, trashExists);
PR_Free(serverTrashName);
}
}
@ -2852,7 +2856,8 @@ nsImapProtocol::DiscoverMailboxSpec(mailbox_spec * adoptedBoxSpec)
// Discover the folder (shuttle over to libmsg, yay)
// Do this only if the folder name is not empty (i.e. the root)
if (*adoptedBoxSpec->allocatedPathName)
if (adoptedBoxSpec->allocatedPathName&&
*adoptedBoxSpec->allocatedPathName)
{
nsString2 boxNameCopy (eOneByte, 0);
@ -2868,7 +2873,7 @@ nsImapProtocol::DiscoverMailboxSpec(mailbox_spec * adoptedBoxSpec)
if (m_hostSessionList)
m_hostSessionList->GetHostIsUsingSubscription(
GetImapHostName(), GetImapUserName(),
hostName, userName,
useSubscription);
if ((GetMailboxDiscoveryStatus() != eContinue) &&
@ -2945,6 +2950,7 @@ nsImapProtocol::DiscoverMailboxSpec(mailbox_spec * adoptedBoxSpec)
NS_ASSERTION (FALSE, "we aren't supposed to be here");
break;
}
PR_FREEIF(userName);
}
void
@ -3326,11 +3332,12 @@ PRBool
nsImapProtocol::GetDeleteIsMoveToTrash()
{
PRBool rv = PR_FALSE;
char *userName = GetImapUserName();
NS_ASSERTION (m_hostSessionList, "fatal... null host session list");
if (m_hostSessionList)
m_hostSessionList->GetDeleteIsMoveToTrashForHost(GetImapHostName(),
GetImapUserName(),
rv);
userName, rv);
PR_FREEIF(userName);
return rv;
}

3
mailnews/imap/src/nsImapProtocol.h
Просмотреть файл

@ -151,7 +151,8 @@ public:
const char* GetImapHostName(); // return the host name from the url for the
// current connection
const char* GetImapUserName(); // return the user name from the identity
char* GetImapUserName(); // return the user name from the identity; caller
// must free the returned username string
// state set by the imap parser...
void NotifyMessageFlags(imapMessageFlagsType flags, nsMsgKey key);

55
mailnews/imap/src/nsImapServerResponseParser.cpp
Просмотреть файл

@ -414,8 +414,13 @@ void nsImapServerResponseParser::ProcessOkCommand(const char *commandToken)
// If we have a valid shell that has not already been cached, then cache it.
if (!m_shell->IsShellCached() && fHostSessionList) // cache is responsible for destroying it
{
PR_LOG(IMAP, PR_LOG_ALWAYS, ("BODYSHELL: Adding shell to cache."));
fHostSessionList->AddShellToCacheForHost(fServerConnection.GetImapHostName(), fServerConnection.GetImapUserName(), m_shell);
PR_LOG(IMAP, PR_LOG_ALWAYS,
("BODYSHELL: Adding shell to cache."));
char *userName = fServerConnection.GetImapUserName();
fHostSessionList->AddShellToCacheForHost(
fServerConnection.GetImapHostName(), userName,
m_shell);
PR_FREEIF(userName);
}
}
else
@ -727,7 +732,7 @@ void nsImapServerResponseParser::mailbox_data()
void nsImapServerResponseParser::mailbox_list(PRBool discoveredFromLsub)
{
mailbox_spec *boxSpec = (mailbox_spec *)PR_Malloc(sizeof(mailbox_spec));
mailbox_spec *boxSpec = (mailbox_spec *)PR_CALLOC(sizeof(mailbox_spec));
if (!boxSpec)
HandleMemoryFailure();
else
@ -783,6 +788,8 @@ void nsImapServerResponseParser::mailbox_list(PRBool discoveredFromLsub)
void nsImapServerResponseParser::mailbox(mailbox_spec *boxSpec)
{
char *boxname = nsnull;
char *userName = fServerConnection.GetImapUserName();
const char* hostName = fServerConnection.GetImapHostName();
if (!PL_strcasecmp(fNextToken, "INBOX"))
{
@ -805,11 +812,13 @@ void nsImapServerResponseParser::mailbox(mailbox_spec *boxSpec)
if (boxname && fHostSessionList)
{
// should the namespace check go before or after the Utf7 conversion?
fHostSessionList->SetNamespaceHierarchyDelimiterFromMailboxForHost(fServerConnection.GetImapHostName(), fServerConnection.GetImapUserName(), boxname, boxSpec->hierarchySeparator);
fHostSessionList->SetNamespaceHierarchyDelimiterFromMailboxForHost(
hostName, userName, boxname, boxSpec->hierarchySeparator);
nsIMAPNamespace *ns = nsnull;
fHostSessionList->GetNamespaceForMailboxForHost(fServerConnection.GetImapHostName(), fServerConnection.GetImapUserName(),boxname, ns);
fHostSessionList->GetNamespaceForMailboxForHost(hostName, userName
,boxname, ns);
if (ns)
{
switch (ns->GetType())
@ -829,7 +838,8 @@ void nsImapServerResponseParser::mailbox(mailbox_spec *boxSpec)
boxSpec->namespaceForFolder = ns;
}
char *convertedName = fServerConnection.CreateUtf7ConvertedString(boxname, PR_FALSE);
char *convertedName =
fServerConnection.CreateUtf7ConvertedString(boxname, PR_FALSE);
PR_Free(boxname);
boxname = convertedName;
}
@ -856,6 +866,7 @@ void nsImapServerResponseParser::mailbox(mailbox_spec *boxSpec)
if (fServerConnection.GetConnectionStatus() < 0)
SetConnected(PR_FALSE);
}
PR_FREEIF(userName);
}
@ -1010,7 +1021,7 @@ void nsImapServerResponseParser::msg_fetch()
char *startPartNum = fNextToken + 5;
if (whereHeader > startPartNum)
{
char *partNum = (char *)PR_Malloc((whereHeader - startPartNum) * sizeof (char));
char *partNum = (char *)PR_CALLOC((whereHeader - startPartNum) * sizeof (char));
if (partNum)
{
PL_strncpy(partNum, startPartNum, (whereHeader - startPartNum));
@ -1639,11 +1650,14 @@ void nsImapServerResponseParser::capability_data()
!at_end_of_line() &&
ContinueParse());
char* userName = fServerConnection.GetImapUserName();
if (fHostSessionList)
fHostSessionList->SetCapabilityForHost(
fServerConnection.GetImapHostName(),
fServerConnection.GetImapUserName(),
userName,
fCapabilityFlag);
PR_FREEIF(userName);
nsImapProtocol *navCon = &fServerConnection;
NS_ASSERTION(navCon, "null imap protocol connection while parsing capability response"); // we should always have this
if (navCon)
@ -1710,6 +1724,8 @@ void nsImapServerResponseParser::namespace_data()
{
EIMAPNamespaceType namespaceType = kPersonalNamespace;
PRBool namespacesCommitted = PR_FALSE;
const char* hostName = fServerConnection.GetImapHostName();
char* userName = fServerConnection.GetImapUserName();
while ((namespaceType != kUnknownNamespace) && ContinueParse())
{
fNextToken = GetNextToken();
@ -1761,7 +1777,8 @@ void nsImapServerResponseParser::namespace_data()
nsIMAPNamespace *newNamespace = new nsIMAPNamespace(namespaceType, namespacePrefix, namespaceDelimiter, PR_FALSE);
// add it to a temporary list in the host
if (newNamespace && fHostSessionList)
fHostSessionList->AddNewNamespaceForHost(fServerConnection.GetImapHostName(), fServerConnection.GetImapUserName(), newNamespace);
fHostSessionList->AddNewNamespaceForHost(
hostName, userName, newNamespace);
skip_to_close_paren(); // Ignore any extension data
@ -1807,9 +1824,12 @@ void nsImapServerResponseParser::namespace_data()
if (!namespacesCommitted && fHostSessionList)
{
PRBool success;
fHostSessionList->FlushUncommittedNamespacesForHost(fServerConnection.GetImapHostName(), fServerConnection.GetImapUserName(), success);
fHostSessionList->FlushUncommittedNamespacesForHost(hostName,
userName,
success);
}
PR_FREEIF(userName);
}
void nsImapServerResponseParser::myrights_data()
@ -2029,9 +2049,14 @@ void nsImapServerResponseParser::UseCachedShell(nsIMAPBodyShell *cachedShell)
void nsImapServerResponseParser::ResetCapabilityFlag()
{
if (fHostSessionList)
{
char* userName = fServerConnection.GetImapUserName();
fHostSessionList->SetCapabilityForHost(
fServerConnection.GetImapHostName(),
fServerConnection.GetImapUserName(), kCapabilityUndefined);
fServerConnection.GetImapHostName(), userName,
kCapabilityUndefined);
PR_FREEIF(userName);
}
}
/*
@ -2197,7 +2222,11 @@ struct mailbox_spec *nsImapServerResponseParser::CreateCurrentMailboxSpec(const
nsIMAPNamespace *ns = nsnull;
if (host != nsnull && fHostSessionList)
{
fHostSessionList->GetNamespaceForMailboxForHost(host, fServerConnection.GetImapUserName(), mailboxNameToConvert, ns); // for delimiter
char* userName = fServerConnection.GetImapUserName();
fHostSessionList->GetNamespaceForMailboxForHost(host,
userName, mailboxNameToConvert, ns); // for
// delimiter
PR_FREEIF(userName);
}
if (ns)