Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 352867, Cert Manager shows incorrect cert names if any twisty is closed

Browse Source 
r=rrelyea
This commit is contained in:
kaie%kuix.de 2006-10-02 20:11:49 +00:00
parent 1928a929d5
commit 630d4f6a21
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/manager/ssl/src/nsCertTree.cpp
View File

@ -261,7 +261,7 @@ nsCertTree::GetThreadDescAtIndex(PRInt32 index)
//
// If the row at index is a cert, return that cert. Otherwise, return null.
nsIX509Cert *
nsCertTree::GetCertAtIndex(PRInt32 index)
nsCertTree::GetCertAtIndex(PRInt32 index, PRInt32 *outAbsoluteCertOffset)
{
int i, idx = 0, cIndex = 0, nc;
nsIX509Cert *rawPtr = nsnull;
@ -273,6 +273,8 @@ nsCertTree::GetCertAtIndex(PRInt32 index)
nc = (mTreeArray[i].open) ? mTreeArray[i].numChildren : 0;
if (index < idx + nc) { // cert is within range of this thread
PRInt32 certIndex = cIndex + index - idx;
if (outAbsoluteCertOffset)
*outAbsoluteCertOffset = certIndex;
nsCOMPtr<nsISupports> isupport =
dont_AddRef(mCertArray->ElementAt(certIndex));
nsCOMPtr<nsIX509Cert> cert = do_QueryInterface(isupport);
@ -723,9 +725,13 @@ nsCertTree::GetCellText(PRInt32 row, nsITreeColumn* col,
_retval.Truncate();
return NS_OK;
}
PRInt32 absoluteCertOffset;
nsCOMPtr<nsIX509Cert> cert = dont_AddRef(GetCertAtIndex(row, &absoluteCertOffset));
PRInt32 colIndex;
col->GetIndex(&colIndex);
PRUint32 arrayIndex=row+colIndex*mNumRows;
PRUint32 arrayIndex=colIndex+absoluteCertOffset*mNumRows;
PRUint32 arrayLength=0;
if (mCellText) {
mCellText->GetLength(&arrayLength);
@ -737,7 +743,7 @@ nsCertTree::GetCellText(PRInt32 row, nsITreeColumn* col,
return NS_OK;
}
}
nsCOMPtr<nsIX509Cert> cert = dont_AddRef(GetCertAtIndex(row));
if (cert == nsnull) return NS_ERROR_FAILURE;
if (NS_LITERAL_STRING("certcol").Equals(colID)) {
rv = cert->GetCommonName(_retval);

2
security/manager/ssl/src/nsCertTree.h
View File

@ -119,7 +119,7 @@ private:
nsCOMPtr<nsINSSComponent> mNSSComponent;
treeArrayEl *GetThreadDescAtIndex(PRInt32 _index);
nsIX509Cert *GetCertAtIndex(PRInt32 _index);
nsIX509Cert *GetCertAtIndex(PRInt32 _index, PRInt32 *outAbsoluteCertOffset = nsnull);
void FreeCertArray();
nsresult UpdateUIContents();