ext/ldap: Ensure list of attribute values is not empty

Author: Girgias

ext/ldap/ldap.c

@@ -2271,6 +2271,14 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
 		} else {
 			SEPARATE_ARRAY(value);
 			num_values = zend_hash_num_elements(Z_ARRVAL_P(value));
+			if (num_values == 0) {
+				zend_argument_value_error(3, "list of attribute values must not be empty");
+				RETVAL_FALSE;
+				num_berval[i] = 0;
+				num_attribs = i + 1;
+				ldap_mods[i]->mod_bvalues = NULL;
+				goto cleanup;
+			}
 
 			num_berval[i] = num_values;
 			ldap_mods[i]->mod_bvalues = safe_emalloc((num_values + 1), sizeof(struct berval *), 0);

ext/ldap/tests/ldap_add_modify_delete_programming_errors.phpt

@@ -143,9 +143,7 @@ bool(false)
 Warning: ldap_add(): Add: Can't contact LDAP server in %s on line %d
 bool(false)
 Error: Object of class stdClass could not be converted to string
-
-Warning: ldap_add(): Add: Can't contact LDAP server in %s on line %d
-bool(false)
+ValueError: ldap_add(): Argument #3 ($entry) list of attribute values must not be empty
 ValueError: ldap_add(): Argument #3 ($entry) must contain arrays with consecutive integer indices starting from 0
 
 Warning: Array to string conversion in %s on line %d

ext/ldap/tests/ldap_add_modify_delete_references_programming_errors.phpt

@@ -76,9 +76,7 @@ try {
 ?>
 --EXPECTF--
 Error: Object of class stdClass could not be converted to string
-
-Warning: ldap_add(): Add: Can't contact LDAP server in %s on line %d
-bool(false)
+ValueError: ldap_add(): Argument #3 ($entry) list of attribute values must not be empty
 
 Warning: Array to string conversion in %s on line %d