337025 - Coverity 411, dead code in mozilla/security/nss/lib/certdb/stanpcertdb.c

Status: RESOLVED FIXED

(NSS :: Libraries, defect, P5)

Description

[Jon Smirl]

The checks for emailProfile!=NULL and profileTime!=NULL are redundant since they were checked to be not NULL a couple of lines earlier.

812  } else if (profileTime && emailProfile) {

@@ -815,18 +815,13 @@
                NSSItem profTime, profData;
                NSSItem *pprofTime, *pprofData;
                NSSITEM_FROM_SECITEM(&subject, &cert->derSubject);
-               if (profileTime) {
-                   NSSITEM_FROM_SECITEM(&profTime, profileTime);
-                   pprofTime = &profTime;
-               } else {
-                   pprofTime = NULL;
-               }
-               if (emailProfile) {
-                   NSSITEM_FROM_SECITEM(&profData, emailProfile);
-                   pprofData = &profData;
-               } else {
-                   pprofData = NULL;
-               }
+
+               NSSITEM_FROM_SECITEM(&profTime, profileTime);
+               pprofTime = &profTime;
+
+               NSSITEM_FROM_SECITEM(&profData, emailProfile);
+               pprofData = &profData;
+
                stanProfile = nssSMIMEProfile_Create(c, pprofTime, pprofData);
                if (!stanProfile) goto loser;
                nssrv = nssCryptoContext_ImportSMIMEProfile(cc, stanProfile);

Comment 1

[Jon Smirl]

Attachment: remove dead code

Comment 2

[Nelson Bolyard (seldom reads bugmail)]

Comment on attachment 221213 [details] [diff] [review]
remove dead code

r=nelson
I'll ask Alexei to commit this.

Comment 3

[Alexei Volkov]

trunk
/cvsroot/mozilla/security/nss/lib/certdb/stanpcertdb.c,v  <--  stanpcertdb.c
new revision: 1.69; previous revision: 1.68

3.11 branch
/cvsroot/mozilla/security/nss/lib/certdb/stanpcertdb.c,v  <--  stanpcertdb.c
new revision: 1.67.28.2; previous revision: 1.67.28.1

Comment 4

[Wan-Teh Chang]

Comment on attachment 221213 [details] [diff] [review]
remove dead code

r=wtc.  I found more dead code that can be removed.
I will attach a patch next.

Comment 5

[Wan-Teh Chang]

Attachment: Remove more dead code

1. 'subject' is assigned but not used.
2. 'pprofTime' and 'pprofData' always have the
   values &profTime and &profData and so aren't
   necessary any more.

Comment 6

[Nelson Bolyard (seldom reads bugmail)]

Comment on attachment 222117 [details] [diff] [review]
Remove more dead code

r=nelson

Comment 7

[Wan-Teh Chang]

Comment on attachment 222117 [details] [diff] [review]
Remove more dead code

I checked in this patch "remove more dead code" on
the NSS trunk (3.12) and NSS_3_11_BRANCH (3.11.2).

Comment 8

[Alexei Volkov]

Coverity CID 411