From 4aade69cbf23998a1de58d2b6dbe5dc2f6795ac0 Mon Sep 17 00:00:00 2001 From: "glen.beasley%sun.com" Date: Fri, 15 Apr 2005 03:00:06 +0000 Subject: [PATCH] null pointer checks git-svn-id: svn://10.0.0.236/branches/SUN_SECURITY_3_3_BRANCH@172260 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/jss/org/mozilla/jss/util/jssutil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/security/jss/org/mozilla/jss/util/jssutil.c b/mozilla/security/jss/org/mozilla/jss/util/jssutil.c index e14d4e1dd0b..4612ae16639 100644 --- a/mozilla/security/jss/org/mozilla/jss/util/jssutil.c +++ b/mozilla/security/jss/org/mozilla/jss/util/jssutil.c @@ -392,8 +392,8 @@ JSS_OctetStringToByteArray(JNIEnv *env, SECItem *item) jbyte *bytes; int size; /* size of the resulting byte array */ - PR_ASSERT(env != NULL && item && item->len>0); - if (!env || item || !item->len || !item->data) { + PR_ASSERT(env != NULL && item != NULL && item->len>0); + if (!env || !item || !item->len || !item->data) { return NULL; }