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

Move custom type checks to ZPP

Browse source 
Closes GH-6034
This commit is contained in:
Máté Kocsis 2020-08-24 20:42:29 +02:00
parent ddc2a2d381
commit 3e800e997b
No known key found for this signature in database
GPG key ID: FD055E41728BF310
19 changed files with 117 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ext/xsl/xsltprocessor.c
View file

@ -666,21 +666,35 @@ PHP_METHOD(XSLTProcessor, setParameter)
{
zval *id = ZEND_THIS;
zval *array_value, *entry, new_string;
zval *entry, new_string;
HashTable *array_value;
xsl_object *intern;
char *namespace;
size_t namespace_len;
zend_string *string_key, *name, *value;
zend_string *string_key, *name, *value = NULL;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "sa", &namespace, &namespace_len, &array_value) == SUCCESS) {
intern = Z_XSL_P(id);
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(array_value), string_key, entry) {
ZEND_PARSE_PARAMETERS_START(2, 3)
Z_PARAM_STRING(namespace, namespace_len)
Z_PARAM_STR_OR_ARRAY_HT(name, array_value)
Z_PARAM_OPTIONAL
Z_PARAM_STR_OR_NULL(value)
ZEND_PARSE_PARAMETERS_END();
intern = Z_XSL_P(id);
if (array_value) {
if (value) {
zend_argument_value_error(3, "must be null when argument #2 ($name) is an array");
RETURN_THROWS();
}
ZEND_HASH_FOREACH_STR_KEY_VAL(array_value, string_key, entry) {
zval tmp;
zend_string *str;
if (string_key == NULL) {
php_error_docref(NULL, E_WARNING, "Invalid parameter array");
RETURN_FALSE;
zend_argument_type_error(2, "must contain only string keys");
RETURN_THROWS();
}
str = zval_try_get_string(entry);
if (UNEXPECTED(!str)) {
@ -690,18 +704,17 @@ PHP_METHOD(XSLTProcessor, setParameter)
zend_hash_update(intern->parameter, string_key, &tmp);
} ZEND_HASH_FOREACH_END();
RETURN_TRUE;
} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "sSS", &namespace, &namespace_len, &name, &value) == SUCCESS) {
intern = Z_XSL_P(id);
} else {
if (!value) {
zend_argument_value_error(3, "cannot be null when argument #2 ($name) is a string");
RETURN_THROWS();
}
ZVAL_STR_COPY(&new_string, value);
zend_hash_update(intern->parameter, name, &new_string);
RETURN_TRUE;
} else {
WRONG_PARAM_COUNT;
}
}
/* }}} end XSLTProcessor::setParameter */