From 59900dd37f836cab2a96e449eace2fa97996aa85 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 13 Apr 2014 20:43:46 -0700 Subject: Fix null byte in LDAP bindings --- ext/ldap/ldap.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'ext/ldap/ldap.c') diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index f5583cd8c0..50055a25a7 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -405,6 +405,16 @@ PHP_FUNCTION(ldap_bind) RETURN_FALSE; } + if (ldap_bind_dn != NULL && memchr(ldap_bind_dn, '\0', ldap_bind_dnlen) != NULL) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "DN contains a null byte"); + RETURN_FALSE; + } + + if (ldap_bind_pw != NULL && memchr(ldap_bind_pw, '\0', ldap_bind_pwlen) != NULL) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Password contains a null byte"); + RETURN_FALSE; + } + ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link); if ((rc = ldap_bind_s(ld->link, ldap_bind_dn, ldap_bind_pw, LDAP_AUTH_SIMPLE)) != LDAP_SUCCESS) { -- cgit v1.2.1