summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2006-05-12 20:36:56 +0000
committerwtchang%redhat.com <devnull@localhost>2006-05-12 20:36:56 +0000
commit365a271163e92884a33c9e6f809593a417459b86 (patch)
treec68f7fa322b0414f6b3ebd49ca8779752dab1e69
parent3063d0d6828e62511133bc5115af3edcf72f6e75 (diff)
downloadnss-hg-365a271163e92884a33c9e6f809593a417459b86.tar.gz
Bugzilla Bug 336937: removed a test that is guaranteed to be true. The
patch is contributed by Jon Smirl <jonsmirl@yahoo.com>. r=nelsonb,wtc. Tag: NSS_3_11_BRANCH
-rw-r--r--security/nss/lib/softoken/pcertdb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/security/nss/lib/softoken/pcertdb.c b/security/nss/lib/softoken/pcertdb.c
index 053747d22..7455602a1 100644
--- a/security/nss/lib/softoken/pcertdb.c
+++ b/security/nss/lib/softoken/pcertdb.c
@@ -2799,8 +2799,7 @@ AddNicknameToSubject(NSSLOWCERTCertDBHandle *dbhandle,
goto loser;
}
- entry->nickname = (nickname) ?
- PORT_ArenaStrdup(entry->common.arena, nickname) : NULL;
+ entry->nickname = PORT_ArenaStrdup(entry->common.arena, nickname);
if ( entry->nickname == NULL ) {
goto loser;