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

Reapply fix for handling non-ASCII characters in signon file that was lost when migration branch landed. Bug 218405, fix originally r=darin sr=bz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@154062 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com 2004-03-17 09:15:55 +00:00
parent 64b8a6f9a3
commit 8a7cdc1d9c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -634,6 +634,7 @@ nsPasswordManager::ReadPasswords(nsIFile* aPasswordFile)
// Read the header
nsAutoString buffer;
nsCAutoString utf8Buffer;
PRBool moreData = PR_FALSE;
nsresult rv = lineStream->ReadLine(buffer, &moreData);
if (NS_FAILED(rv))
@ -656,17 +657,23 @@ nsPasswordManager::ReadPasswords(nsIFile* aPasswordFile)
if (NS_FAILED(rv))
return NS_OK;
// |buffer| will contain UTF-8 encoded characters, so move it into
// a narrow string so we can manipulate it. If NS_ReadLine is ever
// fixed to handle character encoding, this code should be cleaned up.
utf8Buffer.AssignWithConversion(buffer);
switch (state) {
case STATE_REJECT:
if (buffer.Equals(NS_LITERAL_STRING(".")))
if (utf8Buffer.Equals(NS_LITERAL_CSTRING(".")))
state = STATE_REALM;
else
mRejectTable.Put(NS_ConvertUCS2toUTF8(buffer), 1);
mRejectTable.Put(utf8Buffer, 1);
break;
case STATE_REALM:
realm.Assign(NS_ConvertUCS2toUTF8(buffer));
realm.Assign(utf8Buffer);
state = STATE_USERFIELD;
break;
@ -685,12 +692,12 @@ nsPasswordManager::ReadPasswords(nsIFile* aPasswordFile)
}
// If the line is a ., we've reached the end of this realm's entries.
if (buffer.Equals(NS_LITERAL_STRING("."))) {
if (utf8Buffer.Equals(NS_LITERAL_CSTRING("."))) {
entry = nsnull;
state = STATE_REALM;
} else {
entry = new SignonDataEntry();
entry->userField.Assign(buffer);
CopyUTF8toUTF16(utf8Buffer, entry->userField);
state = STATE_USERVALUE;
}
@ -699,7 +706,7 @@ nsPasswordManager::ReadPasswords(nsIFile* aPasswordFile)
case STATE_USERVALUE:
NS_ASSERTION(entry, "bad state");
entry->userValue.Assign(buffer);
CopyUTF8toUTF16(utf8Buffer, entry->userValue);
state = STATE_PASSFIELD;
break;
@ -708,7 +715,8 @@ nsPasswordManager::ReadPasswords(nsIFile* aPasswordFile)
NS_ASSERTION(entry, "bad state");
// Strip off the leading "*" character
entry->passField.Assign(Substring(buffer, 1, buffer.Length() - 1));
CopyUTF8toUTF16(Substring(utf8Buffer, 1, utf8Buffer.Length() - 1),
entry->passField);
state = STATE_PASSVALUE;
break;
@ -716,7 +724,7 @@ nsPasswordManager::ReadPasswords(nsIFile* aPasswordFile)
case STATE_PASSVALUE:
NS_ASSERTION(entry, "bad state");
entry->passValue.Assign(buffer);
CopyUTF8toUTF16(utf8Buffer, entry->passValue);
state = STATE_USERFIELD;
break;