url leak and new tests

Author: devnexen

ext/ldap/ldap.c

@@ -1006,6 +1006,9 @@ PHP_FUNCTION(ldap_connect)
 
 			/* ensure all pending TLS options are applied in a new context */
 			if (ldap_set_option(NULL, LDAP_OPT_X_TLS_NEWCTX, &val) != LDAP_OPT_SUCCESS) {
+				if (url != host) {
+					efree(url);
+				}
 				php_error_docref(NULL, E_WARNING, "Could not create new security context");
 				RETURN_FALSE;
 			}
@@ -1026,6 +1029,9 @@ PHP_FUNCTION(ldap_connect)
 		ldap = ldap_init(host, port);
 		if (ldap == NULL) {
 			zval_ptr_dtor(return_value);
+			if (url != host) {
+				efree(url);
+			}
 			php_error_docref(NULL, E_WARNING, "Could not create session handle");
 			RETURN_FALSE;
 		}

ext/ldap/tests/ldap_connect_port_error.phpt

@@ -0,0 +1,19 @@
+--TEST--
+ldap_connect() - Connection errors
+--EXTENSIONS--
+ldap
+--FILE--
+<?php
+try {
+	ldap_connect("ldap://$host:65536");
+} catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
+try {
+	ldap_connect("ldap://$host:0");
+} catch (\ValueError $e) {
+?>
+--EXPECT--
+must be between 1 and 65535
+must be between 1 and 65535

ext/ldap/tests/ldaps_basic.phpt

@@ -45,7 +45,6 @@ $link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 var_dump(@ldap_bind($link, $user, $passwd));
 ldap_unbind($link);
-
 ?>
 --EXPECT--
 bool(false)