From: Howard Chu <hyc@openldap.org>
Date: Wed, 16 Mar 2011 18:23:26 +0000 (+0000)
Subject: ITS#6863, fix crashes in ITS#6714 patch. From Jan Vcelak @ Red Hat
X-Git-Tag: MIGRATION_CVS2GIT~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=31a8460417d433fe2d1ef9f6d042ba3bc46f7341;p=openldap

ITS#6863, fix crashes in ITS#6714 patch. From Jan Vcelak @ Red Hat
---

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