Bug 399706, glibc detected: free(): invalid pointer attempting to select cert
Regression fix for crash introduced by recent landing for bug 392790. Using minimal fix for M9 endgame. r=kengert, r=Kaspar Brand, a=beltzner git-svn-id: svn://10.0.0.236/trunk@238110 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -444,8 +444,9 @@ nsNSSCertificate::FormatUIStrings(const nsAutoString &nickname, nsAutoString &ni
|
||||
}
|
||||
|
||||
PRUint32 num;
|
||||
PRUnichar **emailAddr = NULL;
|
||||
if (NS_SUCCEEDED(GetEmailAddresses(&num, &emailAddr)) && num > 0) {
|
||||
PRUnichar **emailArray = NULL;
|
||||
if (NS_SUCCEEDED(GetEmailAddresses(&num, &emailArray)) && num > 0) {
|
||||
PRUnichar **emailAddr = emailArray;
|
||||
details.AppendLiteral(" ");
|
||||
if (NS_SUCCEEDED(nssComponent->GetPIPNSSBundleString("CertInfoEmail", info))) {
|
||||
details.Append(info);
|
||||
@@ -478,8 +479,8 @@ nsNSSCertificate::FormatUIStrings(const nsAutoString &nickname, nsAutoString &ni
|
||||
details.Append(PRUnichar('\n'));
|
||||
nsMemory::Free(firstEmail);
|
||||
}
|
||||
nsMemory::Free(emailAddr);
|
||||
emailAddr = nsnull;
|
||||
nsMemory::Free(emailArray);
|
||||
emailArray = nsnull;
|
||||
|
||||
if (NS_SUCCEEDED(nssComponent->GetPIPNSSBundleString("CertInfoIssuedBy", info))) {
|
||||
details.Append(info);
|
||||
|
||||
Reference in New Issue
Block a user