337083 - Coverity 508, dead code in mozilla/security/nss/lib/softoken/dbmshim.c

Status: RESOLVED FIXED

(NSS :: Libraries, defect, P3)

Description

[Jon Smirl]

it is not possible for addr to be not null on error exit

Index: security/nss/lib/softoken/dbmshim.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/softoken/dbmshim.c,v
retrieving revision 1.11
diff -u -r1.11 dbmshim.c
--- security/nss/lib/softoken/dbmshim.c 29 Mar 2005 18:21:18 -0000      1.11
+++ security/nss/lib/softoken/dbmshim.c 8 May 2006 04:12:31 -0000
@@ -406,14 +406,6 @@
 loser:
     /* preserve the error code */
     error = PR_GetError();
-    if (addr) {
-       if (mapfile) {
-           PORT_Assert(len != -1);
-           PR_MemUnmap(addr,len);
-       } else {
-           PORT_Free(addr);
-       }
-    }
     if (mapfile) {
        PR_CloseFileMap(mapfile);
     }

Comment 1

[Jon Smirl]

Attachment: remove dead code in error path

Comment 2

[Nelson Bolyard (seldom reads bugmail)]

Wan-Teh, does this change trigger a need for a new FIPS review of softoken?

Comment 3

[Nelson Bolyard (seldom reads bugmail)]

Checked in on trunk.
new revision: 1.12; previous revision: 1.11

Comment 4

[Nelson Bolyard (seldom reads bugmail)]

Checked in on NSS_3_11_BRANCH
new revision: 1.11.30.1; previous revision: 1.11