summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulien.pierre.bugs%sun.com <devnull@localhost>2005-11-11 02:45:59 +0000
committerjulien.pierre.bugs%sun.com <devnull@localhost>2005-11-11 02:45:59 +0000
commitb5882ef97019a4ad2a29112729d5fdeddc24d028 (patch)
treefac599956a0112a5340eb2e3b79799ca1b9a5bda
parent4aecc9fb6049c71ce06c870027b98baf8ec96d03 (diff)
downloadnss-hg-b5882ef97019a4ad2a29112729d5fdeddc24d028.tar.gz
Fix for 292156. Prevent crash in SSL session cache init if invalid arguments are passed. r=nelson
-rw-r--r--security/nss/lib/ssl/sslsnce.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index 469a1e4f1..877a5a995 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -921,6 +921,11 @@ InitCache(cacheDesc *cache, int maxCacheEntries, PRUint32 ssl2_timeout,
int locks_to_initialize = 0;
PRUint32 init_time;
+ if ( (!cache) || (maxCacheEntries < 0) || (!directory) ) {
+ PORT_SetError(SEC_ERROR_INVALID_ARGS);
+ return SECFailure;
+ }
+
if (cache->cacheMem) {
/* Already done */
return SECSuccess;