Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 128948, crash in password manager, r=racham, sr=jag, a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@116423 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
morse%netscape.com
2002-03-12 21:19:03 +00:00
parent e74ceedc1d
commit 83b7c6e601
2 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
mozilla/extensions/wallet/src/nsPasswordManager.cpp
View File

@@ -220,40 +220,42 @@ nsPasswordManager::FindPasswordEntry(char **hostURI, PRUnichar **username, PRUni
// Emumerate through password elements
while (hasMoreElements) {
rv = enumerator->GetNext(getter_AddRefs(passwordElem));
if (NS_SUCCEEDED(rv) && passwordElem) {
// Get the server URI stored as host
nsXPIDLCString thisHostURI;
passwordElem->GetHost(getter_Copies(thisHostURI));
if (NS_FAILED(rv)) {
return rv; // could not unlock the database
}
nsXPIDLString thisUsername;
passwordElem->GetUser(getter_Copies(thisUsername));
// Get the server URI stored as host
nsXPIDLCString thisHostURI;
passwordElem->GetHost(getter_Copies(thisHostURI));
nsXPIDLString thisPassword;
passwordElem->GetPassword(getter_Copies(thisPassword));
nsXPIDLString thisUsername;
passwordElem->GetUser(getter_Copies(thisUsername));
// Check if any of the params are null (set by getter_Copies as
// preparation for output parameters) and treat them wild card
// entry matches or if they match with current password element
// attribute values.
PRBool hostURIOK = !*hostURI || thisHostURI.Equals(*hostURI);
PRBool usernameOK = !*username || thisUsername.Equals(*username);
PRBool passwordOK = !*password || thisPassword.Equals(*password);
nsXPIDLString thisPassword;
passwordElem->GetPassword(getter_Copies(thisPassword));
// If a password match is found based on given input params,
// fill in those params which are passed in as empty strings.
if (hostURIOK && usernameOK && passwordOK)
{
if (!*hostURI) {
*hostURI = ToNewCString(thisHostURI);
}
if (!*username) {
*username = ToNewUnicode(thisUsername);
}
if (!*password) {
*password = ToNewUnicode(thisPassword);
}
break;
// Check if any of the params are null (set by getter_Copies as
// preparation for output parameters) and treat them wild card
// entry matches or if they match with current password element
// attribute values.
PRBool hostURIOK = !*hostURI || thisHostURI.Equals(*hostURI);
PRBool usernameOK = !*username || thisUsername.Equals(*username);
PRBool passwordOK = !*password || thisPassword.Equals(*password);
// If a password match is found based on given input params,
// fill in those params which are passed in as empty strings.
if (hostURIOK && usernameOK && passwordOK)
{
if (!*hostURI) {
*hostURI = ToNewCString(thisHostURI);
}
if (!*username) {
*username = ToNewUnicode(thisUsername);
}
if (!*password) {
*password = ToNewUnicode(thisPassword);
}
break;
}
enumerator->HasMoreElements(&hasMoreElements);
}

6
mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
View File

@@ -1609,7 +1609,11 @@ nsMsgIncomingServer::GetIsAuthenticated(PRBool *isAuthenticated)
// Get password entry corresponding to the host URI we are passing in.
rv = passwordMgr->FindPasswordEntry(&hostURI, getter_Copies(userName), getter_Copies(password));
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
// release hostURI
nsMemory::Free(hostURI);
return rv;
}
// release hostURI
nsMemory::Free(hostURI);