зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Родитель
a172cbe397
Коммит
0d612a798a
|
@ -34,7 +34,7 @@
|
||||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
*
|
*
|
||||||
* ***** END LICENSE BLOCK ***** */
|
* ***** END LICENSE BLOCK ***** */
|
||||||
/* $Id: keydb.c,v 1.43 2006/03/21 19:33:52 rrelyea%redhat.com Exp $ */
|
/* $Id: keydb.c,v 1.44 2006/05/13 00:27:22 alexei.volkov.bugs%sun.com Exp $ */
|
||||||
|
|
||||||
#include "lowkeyi.h"
|
#include "lowkeyi.h"
|
||||||
#include "seccomon.h"
|
#include "seccomon.h"
|
||||||
|
@ -713,7 +713,6 @@ nsslowkey_UpdateKeyDBPass1(NSSLOWKEYDBHandle *handle)
|
||||||
DBT key;
|
DBT key;
|
||||||
DBT data;
|
DBT data;
|
||||||
unsigned char version;
|
unsigned char version;
|
||||||
SECItem *rc4key = NULL;
|
|
||||||
NSSLOWKEYDBKey *dbkey = NULL;
|
NSSLOWKEYDBKey *dbkey = NULL;
|
||||||
NSSLOWKEYDBHandle *update = NULL;
|
NSSLOWKEYDBHandle *update = NULL;
|
||||||
SECItem *oldSalt = NULL;
|
SECItem *oldSalt = NULL;
|
||||||
|
@ -882,10 +881,6 @@ done:
|
||||||
|
|
||||||
nsslowkey_CloseKeyDB(update);
|
nsslowkey_CloseKeyDB(update);
|
||||||
|
|
||||||
if ( rc4key ) {
|
|
||||||
SECITEM_FreeItem(rc4key, PR_TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( oldSalt ) {
|
if ( oldSalt ) {
|
||||||
SECITEM_FreeItem(oldSalt, PR_TRUE);
|
SECITEM_FreeItem(oldSalt, PR_TRUE);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче