From 4d8cd33db10247fcc6e6e864aabf382b80392c6e Mon Sep 17 00:00:00 2001 From: "alexei.volkov.bugs%sun.com" Date: Sat, 13 May 2006 00:27:22 +0000 Subject: [PATCH] Patch contributed by jonsmirl@yahoo.com [Bug 336935] Coverity 172, dead code in mozilla/security/nss/lib/softoken/keydb.c. r=nelson, r=alexei.volkov.bugs git-svn-id: svn://10.0.0.236/branches/NSS_3_11_BRANCH@196441 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/softoken/keydb.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mozilla/security/nss/lib/softoken/keydb.c b/mozilla/security/nss/lib/softoken/keydb.c index 28c527b38d2..0000cd2e609 100644 --- a/mozilla/security/nss/lib/softoken/keydb.c +++ b/mozilla/security/nss/lib/softoken/keydb.c @@ -34,7 +34,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: keydb.c,v 1.40.2.1 2006-04-04 18:44:18 wtchang%redhat.com Exp $ */ +/* $Id: keydb.c,v 1.40.2.2 2006-05-13 00:27:12 alexei.volkov.bugs%sun.com Exp $ */ #include "lowkeyi.h" #include "seccomon.h" @@ -713,7 +713,6 @@ nsslowkey_UpdateKeyDBPass1(NSSLOWKEYDBHandle *handle) DBT key; DBT data; unsigned char version; - SECItem *rc4key = NULL; NSSLOWKEYDBKey *dbkey = NULL; NSSLOWKEYDBHandle *update = NULL; SECItem *oldSalt = NULL; @@ -882,10 +881,6 @@ done: nsslowkey_CloseKeyDB(update); - if ( rc4key ) { - SECITEM_FreeItem(rc4key, PR_TRUE); - } - if ( oldSalt ) { SECITEM_FreeItem(oldSalt, PR_TRUE); }