From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 24 Mar 2011 02:23:39 +0000 (+0000)
Subject: ITS#6863
X-Git-Tag: OPENLDAP_REL_ENG_2_4_25~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=90df62f93fc77cea38ceb04138f5a4b782d732a8;p=openldap

ITS#6863
---

diff --git a/CHANGES b/CHANGES
index ed3ffc316c..de5c23143e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.25 Engineering
 	Fixed ldapsearch pagedresults loop (ITS#6755)
 	Fixed tools for incompatible args (ITS#6849)
+	Fixed libldap MozNSS crash (ITS#6863)
 	Fixed slapd add objectclasses in order (ITS#6837)
 	Added slapd ordering for uidNumber and gidNumber (ITS#6852)
 	Fixed slapd segfault when adding values out of order (ITS#6858)
diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
index 6d1c0a4ca1..911885ddcd 100644
--- a/libraries/libldap/tls_m.c
+++ b/libraries/libldap/tls_m.c
@@ -2272,7 +2272,7 @@ tlsm_is_non_ssl_message( PRFileDesc *fd, ber_tag_t *thebyte )
 	}
 
 	if ( p->firsttag == LBER_SEQUENCE ) {
-		if ( *thebyte ) {
+		if ( thebyte ) {
 			*thebyte = p->firsttag;
 		}
 		return 1;
@@ -2769,7 +2769,7 @@ tlsm_PR_GetSocketOption(PRFileDesc *fd, PRSocketOptionData *data)
 	struct tls_data		*p;
  	p = tlsm_get_pvt_tls_data( fd );
 
-	if ( !data ) {
+	if ( p == NULL || data == NULL ) {
 		return PR_FAILURE;
 	}