ldap_connect fails if ldap_set_option fails

remicollet · remicollet · commit 665e79cc1d09 · 2025-03-03T09:02:57.000+01:00
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
@@ -993,7 +993,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) {
+				zval_ptr_dtor(return_value);
 				php_error_docref(NULL, E_WARNING, "Could not create new security context");
+				RETURN_FALSE;
 			}
 		}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -993,7 +993,9 @@ PHP_FUNCTION(ldap_connect)`
`993`	`993`
`994`	`994`	`/* ensure all pending TLS options are applied in a new context */`
`995`	`995`	`if (ldap_set_option(NULL, LDAP_OPT_X_TLS_NEWCTX, &val) != LDAP_OPT_SUCCESS) {`
	`996`	`+ zval_ptr_dtor(return_value);`
`996`	`997`	`php_error_docref(NULL, E_WARNING, "Could not create new security context");`
	`998`	`+ RETURN_FALSE;`
`997`	`999`	`}`
`998`	`1000`	`}`
`999`	`1001`	`#endif`