php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error message for too long file in ext/tidy (#14870)

Browse Source 
As suggested in https://github.com/php/php-src/pull/14862#discussion_r1667788025
This commit is contained in:
Niels Dossche
2024-07-08 06:06:57 -07:00
committed by GitHub
parent 2f97ad9c10
commit c695b1dc88
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/tidy/tests/parsing_file_too_large.phpt
View File

@@ -61,7 +61,7 @@ unlink($path);
?>
--EXPECT--
int(0)
ValueError: Input string is too long
ValueError: Input string is too long
ValueError: Input string is too long
ValueError: tidy_repair_file(): Argument #1 ($filename) Input string is too long
ValueError: File content is too long
ValueError: File content is too long
ValueError: File content is too long
ValueError: tidy_repair_file(): Argument #1 ($filename) File content is too long

10
ext/tidy/tidy.c
View File

@@ -306,7 +306,7 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, bool is_file)
if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(data))) {
if (is_file) {
zend_string_release_ex(data, false);
zend_argument_value_error(1, "Input string is too long");
zend_argument_value_error(1, "File content is too long");
} else {
zend_argument_value_error(1, "is too long");
}
@@ -973,7 +973,7 @@ static zend_result php_tidy_output_handler(void **nothing, php_output_context *o
tidyOptSetBool(doc, TidyMark, no);
if (ZEND_SIZE_T_UINT_OVFL(output_context->in.used)) {
php_error_docref(NULL, E_WARNING, "Input string is too long");
php_error_docref(NULL, E_WARNING, "File content is too long");
return status;
}
@@ -1086,7 +1086,7 @@ PHP_FUNCTION(tidy_parse_file)
if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(contents))) {
zend_string_release_ex(contents, 0);
zend_value_error("Input string is too long");
zend_value_error("File content is too long");
RETURN_THROWS();
}
@@ -1384,7 +1384,7 @@ PHP_METHOD(tidy, __construct)
if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(contents))) {
zend_string_release_ex(contents, 0);
zend_value_error("Input string is too long");
zend_value_error("File content is too long");
RETURN_THROWS();
}
@@ -1423,7 +1423,7 @@ PHP_METHOD(tidy, parseFile)
if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(contents))) {
zend_string_release_ex(contents, 0);
zend_value_error("Input string is too long");
zend_value_error("File content is too long");
RETURN_THROWS();
}