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

Fix the case where a page prefills the username to one that we haven't saved locally, so that we don't overwrite what the page filled in (bug 270558). Patch by Phil Ringnalda <philringnalda@gmail.com> r=me.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@190634 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com 2006-02-21 00:58:06 +00:00
parent c7989ee277
commit 12a5938ef8
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/toolkit/components/passwordmgr/base/nsPasswordManager.cpp
View File

@ -824,6 +824,7 @@ nsPasswordManager::OnStateChange(nsIWebProgress* aWebProgress,
nsCOMPtr<nsIForm> form = do_QueryInterface(formNode);
SignonDataEntry* firstMatch = nsnull;
PRBool attachedToInput = PR_FALSE;
PRBool prefilledUser = PR_FALSE;
nsCOMPtr<nsIDOMHTMLInputElement> userField, passField;
nsCOMPtr<nsIDOMHTMLInputElement> temp;
nsAutoString fieldType;
@ -909,6 +910,7 @@ nsPasswordManager::OnStateChange(nsIWebProgress* aWebProgress,
// for that username. If there are multiple saved usernames,
// we will also attach the autocomplete listener.
prefilledUser = PR_TRUE;
nsAutoString userValue;
if (NS_FAILED(DecryptData(e->userValue, userValue)))
goto done;
@ -936,21 +938,29 @@ nsPasswordManager::OnStateChange(nsIWebProgress* aWebProgress,
}
}
// If we found more than one match, attachedToInput will be true,
// but if we found just one, we need to attach the autocomplete listener,
// and fill in the username and password only if the HTML didn't prefill
// the username.
if (firstMatch && !attachedToInput) {
nsAutoString buffer;
if (userField)
AttachToInput(userField);
if (userField) {
if (NS_FAILED(DecryptData(firstMatch->userValue, buffer)))
if (!prefilledUser){
nsAutoString buffer;
if (userField) {
if (NS_FAILED(DecryptData(firstMatch->userValue, buffer)))
goto done;
userField->SetValue(buffer);
}
if (NS_FAILED(DecryptData(firstMatch->passValue, buffer)))
goto done;
userField->SetValue(buffer);
AttachToInput(userField);
passField->SetValue(buffer);
}
if (NS_FAILED(DecryptData(firstMatch->passValue, buffer)))
goto done;
passField->SetValue(buffer);
}
}