337154 - Coverity 321, dead code in mozilla/security/nss/lib/pk11wrap/pk11cert.c

Status: RESOLVED FIXED

Description

[Jon Smirl]

This is just wrong and should be removed. 

@@ -1319,7 +1319,6 @@
     /* get them all! */
     list = PK11_GetAllTokens(CKM_INVALID_MECHANISM,PR_FALSE,PR_TRUE,wincx);
     if (list == NULL) {
-       if (list) PK11_FreeSlotList(list);
        return CK_INVALID_HANDLE;
     }

Comment 1

[Jon Smirl]

Created attachment 221327 [details] [diff] [review]
remove dead code in error path

Comment 2

[Jon Smirl]

Same problem in a different place

@@ -1084,7 +1084,6 @@
     /* get them all! */
     list = PK11_GetAllTokens(CKM_INVALID_MECHANISM,PR_FALSE,PR_TRUE,wincx);
     if (list == NULL) {
-       if (list) PK11_FreeSlotList(list);
        return CK_INVALID_HANDLE;
     }

Comment 3

[Alexei Volkov]

trunk
/cvsroot/mozilla/security/nss/lib/pk11wrap/pk11cert.c,v  <--  pk11cert.c
new revision: 1.147; previous revision: 1.146

3.11 branch
/cvsroot/mozilla/security/nss/lib/pk11wrap/pk11cert.c,v  <--  pk11cert.c
new revision: 1.143.2.3; previous revision: 1.143.2.2

Comment 4

[Nelson Bolyard (seldom reads bugmail)]

reopening.  
This bug is one of several that has several complaints about a file,
and includes a patch that only fixes one of them. 
Checking in the fix for one of them doesn't resolve the whole bug.
Please re-review all the coverity bugs recently marked RESOLVED/FIXED
to make sure that all the problems reported in the bug were fixed, 
and not only just the first one.

Comment 5

[Alexei Volkov]

Created attachment 222411 [details] [diff] [review]
fix two more places

Comment 6

[Nelson Bolyard (seldom reads bugmail)]

Comment on attachment 222411 [details] [diff] [review]
fix two more places

r=nelson

Comment 7

[Alexei Volkov]

second patch:

trunk:
/cvsroot/mozilla/security/nss/lib/pk11wrap/pk11cert.c,v  <--  pk11cert.c
new revision: 1.150; previous revision: 1.149

3.11 branch:
/cvsroot/mozilla/security/nss/lib/pk11wrap/pk11cert.c,v  <--  pk11cert.c
new revision: 1.143.2.6; previous revision: 1.143.2.5

Comment 8

[Nelson Bolyard (seldom reads bugmail)]

Also CID 149

Comment 9

[:Gavin Sharp [email: [e-mail]]]

*** Bug 337633 has been marked as a duplicate of this bug. ***