Skip to content

Commit 657f79b

Browse files
committed
change from feedback
1 parent cb8e659 commit 657f79b

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

ext/ldap/ldap.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -984,8 +984,6 @@ PHP_FUNCTION(ldap_connect)
984984
RETURN_FALSE;
985985
}
986986

987-
object_init_ex(return_value, ldap_link_ce);
988-
ld = Z_LDAP_LINK_P(return_value);
989987

990988
{
991989
int rc = LDAP_SUCCESS;
@@ -994,7 +992,6 @@ PHP_FUNCTION(ldap_connect)
994992
size_t urllen = hostlen + sizeof( "ldap://:65535" );
995993

996994
if (port <= 0 || port > 65535) {
997-
zval_ptr_dtor(return_value);
998995
zend_argument_value_error(2, "must be between 1 and 65535");
999996
RETURN_THROWS();
1000997
}
@@ -1016,10 +1013,12 @@ PHP_FUNCTION(ldap_connect)
10161013
LDAPG(tls_newctx) = false;
10171014
}
10181015
#endif
1016+
object_init_ex(return_value, ldap_link_ce);
1017+
ld = Z_LDAP_LINK_P(return_value);
10191018

10201019
#ifdef LDAP_API_FEATURE_X_OPENLDAP
10211020
/* ldap_init() is deprecated, use ldap_initialize() instead.
1022-
*/
1021+
*/
10231022
rc = ldap_initialize(&ldap, url);
10241023
#else /* ! LDAP_API_FEATURE_X_OPENLDAP */
10251024
/* ldap_init does not support URLs.

0 commit comments

Comments
 (0)