Skip to content
Closed

Gh18902 #18903

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ext/ldap/ldap.c
Original file line number Diff line number Diff line change
Expand Up @@ -4036,7 +4036,12 @@ static void php_ldap_exop(INTERNAL_FUNCTION_PARAMETERS, bool force_sync) {
LDAPControl **lserverctrls = NULL;
int rc, msgid;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "OS|S!a!zz", &link, ldap_link_ce, &reqoid, &reqdata, &serverctrls, &retdata, &retoid) != SUCCESS) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OP|S!a!zz", &link, ldap_link_ce, &reqoid, &reqdata, &serverctrls, &retdata, &retoid) != SUCCESS) {
RETURN_THROWS();
}

if (ZSTR_LEN(reqoid) == 0) {
zend_argument_value_error(2, "must not be empty");
RETURN_THROWS();
}

Expand Down
30 changes: 30 additions & 0 deletions ext/ldap/tests/gh18902.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
--TEST--
GH-17704 (ldap_search fails when $attributes contains a non-packed array with numerical keys)
--EXTENSIONS--
ldap
--FILE--
<?php
$conn = ldap_connect();

try {
ldap_exop($conn,"\0");
} catch (\ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}

try {
ldap_exop_sync($conn,"");
} catch (\ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}

try {
ldap_exop_sync($conn,"test\0");
} catch (\ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}
?>
--EXPECTF--
ldap_exop(): Argument #2 ($request_oid) must not contain any null bytes
ldap_exop_sync(): Argument #2 ($request_oid) must not be empty
ldap_exop_sync(): Argument #2 ($request_oid) must not contain any null bytes
Loading