ITS#6863

diff --git a/CHANGES b/CHANGES
index ed3ffc316c11d21fa056760b3c3e588629a54eaf..de5c23143eaad20f3eef99e08074459e057e0283 100644 (file)
--- 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 6d1c0a4ca114195ec7e990e685cab91bbb8e56de..911885ddcd5c80edffd749234852215c503d93cc 100644 (file)
--- 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;
        }