ITS#6863

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)

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;
 	}