diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2019-12-31 11:27:02 +0100 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2019-12-31 11:46:11 +0100 |
| commit | 345703724c633fb8c1b34e1299bf3375f000c398 (patch) | |
| tree | 18da0e12163e82ce16fbee726df1839439a1edfa /ext/tidy | |
| parent | d9ac1ca8de298baf10f7c713c0b37c6ea5d89cf4 (diff) | |
| download | php-git-345703724c633fb8c1b34e1299bf3375f000c398.tar.gz | |
Use RETURN_THROWS() during ZPP in most of the extensions
Except for some bigger ones: reflection, sodium, spl
Diffstat (limited to 'ext/tidy')
| -rw-r--r-- | ext/tidy/tidy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index a519cd39cc..b045ffa29a 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -56,7 +56,7 @@ PHPTidyObj *obj; \ zval *object; \ if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &object, tidy_ce_doc) == FAILURE) { \ - return; \ + RETURN_THROWS(); \ } \ obj = Z_TIDY_P(object); \ @@ -64,7 +64,7 @@ PHPTidyObj *obj; \ TIDY_SET_CONTEXT; \ if (zend_parse_parameters_none() == FAILURE) { \ - return; \ + RETURN_THROWS(); \ } \ obj = Z_TIDY_P(object); \ @@ -459,14 +459,14 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil zend_bool use_include_path = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|zsb", &arg1, &config, &enc, &enc_len, &use_include_path) == FAILURE) { - return; + RETURN_THROWS(); } if (!(data = php_tidy_file_to_mem(ZSTR_VAL(arg1), use_include_path))) { RETURN_FALSE; } } else { if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|zs", &arg1, &config, &enc, &enc_len) == FAILURE) { - return; + RETURN_THROWS(); } data = arg1; } @@ -1108,7 +1108,7 @@ static PHP_FUNCTION(tidy_parse_string) PHPTidyObj *obj; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|zs", &input, &options, &enc, &enc_len) == FAILURE) { - return; + RETURN_THROWS(); } if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(input))) { @@ -1171,7 +1171,7 @@ static PHP_FUNCTION(tidy_parse_file) if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|zsb", &inputfile, &options, &enc, &enc_len, &use_include_path) == FAILURE) { - return; + RETURN_THROWS(); } tidy_instanciate(tidy_ce_doc, return_value); @@ -1249,7 +1249,7 @@ static PHP_FUNCTION(tidy_diagnose) static PHP_FUNCTION(tidy_get_release) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } #if HAVE_TIDYRELEASEDATE @@ -1479,7 +1479,7 @@ static TIDY_DOC_METHOD(__construct) if (zend_parse_parameters(ZEND_NUM_ARGS(), "|Pzsb", &inputfile, &options, &enc, &enc_len, &use_include_path) == FAILURE) { - return; + RETURN_THROWS(); } obj = Z_TIDY_P(object); @@ -1518,7 +1518,7 @@ static TIDY_DOC_METHOD(parseFile) if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|zsb", &inputfile, &options, &enc, &enc_len, &use_include_path) == FAILURE) { - return; + RETURN_THROWS(); } if (!(contents = php_tidy_file_to_mem(ZSTR_VAL(inputfile), use_include_path))) { @@ -1553,7 +1553,7 @@ static TIDY_DOC_METHOD(parseString) TIDY_SET_CONTEXT; if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|zs", &input, &options, &enc, &enc_len) == FAILURE) { - return; + RETURN_THROWS(); } if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(input))) { |