summaryrefslogtreecommitdiff
path: root/security/nss
diff options
context:
space:
mode:
authornelson%bolyard.com <devnull@localhost>2007-05-03 03:32:19 +0000
committernelson%bolyard.com <devnull@localhost>2007-05-03 03:32:19 +0000
commitbda98ce4644641ec5f5a9d736438414554ce5ca2 (patch)
tree668cdb66ee2708cd0f02788530ae253962660e0e /security/nss
parentb6d7a6505f3434654e691b4b4a99cb56ce548a79 (diff)
downloadnss-hg-bda98ce4644641ec5f5a9d736438414554ce5ca2.tar.gz
Bug 337088 ? Coverity 405, PK11_ParamToAlgid() r=rrelyea,sr=wtc
Diffstat (limited to 'security/nss')
-rw-r--r--security/nss/lib/pk11wrap/pk11mech.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/nss/lib/pk11wrap/pk11mech.c b/security/nss/lib/pk11wrap/pk11mech.c
index 90af17a9a..7f46459da 100644
--- a/security/nss/lib/pk11wrap/pk11mech.c
+++ b/security/nss/lib/pk11wrap/pk11mech.c
@@ -1480,7 +1480,6 @@ PK11_ParamToAlgid(SECOidTag algTag, SECItem *param,
SECStatus rv = SECFailure;
unsigned long rc2version;
- rv = SECSuccess;
switch (type) {
case CKM_RC4:
case CKM_CAMELLIA_ECB:
@@ -1599,6 +1598,8 @@ PK11_ParamToAlgid(SECOidTag algTag, SECItem *param,
case CKM_JUNIPER_SHUFFLE:
newParams = SEC_ASN1EncodeItem(NULL,NULL,param,
SEC_OctetStringTemplate);
+ if (newParams == NULL)
+ break;
rv = SECSuccess;
break;
}