archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source
This commit is contained in:
David Carlier 2025-05-25 12:53:54 +01:00
commit 4076324c6f
No known key found for this signature in database
GPG key ID: 8486F847B4B94EF1
2 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/ldap/ldap.c
View file

@ -1011,8 +1011,6 @@ PHP_FUNCTION(ldap_connect)
RETURN_FALSE; RETURN_FALSE;
} }
object_init_ex(return_value, ldap_link_ce);
ld = Z_LDAP_LINK_P(return_value);
{ {
int rc = LDAP_SUCCESS; int rc = LDAP_SUCCESS;
@ -1035,13 +1033,17 @@ PHP_FUNCTION(ldap_connect)
/* ensure all pending TLS options are applied in a new context */ /* 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 (ldap_set_option(NULL, LDAP_OPT_X_TLS_NEWCTX, &val) != LDAP_OPT_SUCCESS) {
zval_ptr_dtor(return_value); if (url != host) {
efree(url);
}
php_error_docref(NULL, E_WARNING, "Could not create new security context"); php_error_docref(NULL, E_WARNING, "Could not create new security context");
RETURN_FALSE; RETURN_FALSE;
} }
LDAPG(tls_newctx) = false; LDAPG(tls_newctx) = false;
} }
#endif #endif
object_init_ex(return_value, ldap_link_ce);
ld = Z_LDAP_LINK_P(return_value);
#ifdef LDAP_API_FEATURE_X_OPENLDAP #ifdef LDAP_API_FEATURE_X_OPENLDAP
/* ldap_init() is deprecated, use ldap_initialize() instead. /* ldap_init() is deprecated, use ldap_initialize() instead.
@ -1054,6 +1056,9 @@ PHP_FUNCTION(ldap_connect)
ldap = ldap_init(host, port); ldap = ldap_init(host, port);
if (ldap == NULL) { if (ldap == NULL) {
zval_ptr_dtor(return_value); zval_ptr_dtor(return_value);
if (url != host) {
efree(url);
}
php_error_docref(NULL, E_WARNING, "Could not create session handle"); php_error_docref(NULL, E_WARNING, "Could not create session handle");
RETURN_FALSE; RETURN_FALSE;
} }

24
ext/ldap/tests/ldap_connect_port_error.phpt Normal file
View file

@ -0,0 +1,24 @@
--TEST--
ldap_connect() - Connection errors
--EXTENSIONS--
ldap
--INI--
error_reporting=E_ALL & ~E_DEPRECATED
--FILE--
<?php
require "connect.inc";
try {
ldap_connect("nope://$host", 65536);
} catch (\ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}
try {
ldap_connect("nope://$host", 0);
} catch (\ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}
?>
--EXPECT--
ldap_connect(): Argument #2 ($port) must be between 1 and 65535
ldap_connect(): Argument #2 ($port) must be between 1 and 65535