Skip to content

std: throw ValueError on invalid INI scanner mode #24429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Girgias wants to merge 1 commit into
base: master
Choose a base branch
from
Open

std: throw ValueError on invalid INI scanner mode #24429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions Zend/tests/bug61087.phpt
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2508,10 +2508,9 @@ PHP_FUNCTION(parse_ini_file)
RETURN_THROWS();
}

/* Sanity check */
if (UNEXPECTED(scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW && scanner_mode != ZEND_INI_SCANNER_TYPED)) {
php_error_docref(NULL, E_WARNING, "Invalid scanner mode");
RETURN_FALSE;
zend_argument_value_error(3, "must be one of INI_SCANNER_NORMAL, INI_SCANNER_RAW, or INI_SCANNER_TYPED");
RETURN_THROWS();
}

/* Set callback function */
Expand Down Expand Up @@ -2550,10 +2549,9 @@ PHP_FUNCTION(parse_ini_string)
Z_PARAM_LONG(scanner_mode)
ZEND_PARSE_PARAMETERS_END();

/* Sanity check */
if (UNEXPECTED(scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW && scanner_mode != ZEND_INI_SCANNER_TYPED)) {
php_error_docref(NULL, E_WARNING, "Invalid scanner mode");
RETURN_FALSE;
zend_argument_value_error(3, "must be one of INI_SCANNER_NORMAL, INI_SCANNER_RAW, or INI_SCANNER_TYPED");
RETURN_THROWS();
}

if (INT_MAX - str_len < ZEND_MMAP_AHEAD) {
Expand Down
13 changes: 8 additions & 5 deletions ext/standard/tests/file/parse_ini_file_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ echo "*** Testing parse_ini_file() : error conditions ***\n";
echo "\n-- Testing parse_ini_file() function with invalid scanner mode --\n";
$filename = 'string_val';
$process_sections = true;
$scanner_mode = 10;
var_dump( parse_ini_file($filename, $process_sections, $scanner_mode) );

try {
$scanner_mode = 10;
var_dump( parse_ini_file($filename, $process_sections, $scanner_mode) );
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), "\n";
}

echo "\n-- Testing parse_ini_file() function with a non-existent file --\n";
$filename = __FILE__ . 'invalidfilename';
Expand All @@ -21,9 +26,7 @@ echo "Done";
*** Testing parse_ini_file() : error conditions ***

-- Testing parse_ini_file() function with invalid scanner mode --

Warning: parse_ini_file(): Invalid scanner mode in %s on line %d
bool(false)
ValueError: parse_ini_file(): Argument #3 ($scanner_mode) must be one of INI_SCANNER_NORMAL, INI_SCANNER_RAW, or INI_SCANNER_TYPED

-- Testing parse_ini_file() function with a non-existent file --

Expand Down
Loading