Skip to content

Fix GH-24579: Validate option_array type before accessing as hash table #24619

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

Closed
paezraphael wants to merge 1 commit into from
Closed

Fix GH-24579: Validate option_array type before accessing as hash table #24619

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
6 changes: 3 additions & 3 deletions ext/filter/logical_filters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#define FETCH_DOUBLE_OPTION(var_name, option_name) \
var_name = 0; \
var_name##_set = 0; \
if (option_array) { \
if (option_array && Z_TYPE_P(option_array) == IS_ARRAY) { \
if ((option_val = zend_hash_str_find(Z_ARRVAL_P(option_array), option_name, sizeof(option_name) - 1)) != NULL) { \
var_name = zval_get_double(option_val); \
var_name##_set = 1; \
Expand All @@ -47,7 +47,7 @@
#define FETCH_LONG_OPTION(var_name, option_name) \
var_name = 0; \
var_name##_set = 0; \
if (option_array) { \
if (option_array && Z_TYPE_P(option_array) == IS_ARRAY) { \
if ((option_val = zend_hash_str_find(Z_ARRVAL_P(option_array), option_name, sizeof(option_name) - 1)) != NULL) { \
var_name = zval_get_long(option_val); \
var_name##_set = 1; \
Expand All @@ -60,7 +60,7 @@
var_name = NULL; \
var_name##_set = 0; \
var_name##_len = 0; \
if (option_array) { \
if (option_array && Z_TYPE_P(option_array) == IS_ARRAY) { \
if ((option_val = zend_hash_str_find_deref(Z_ARRVAL_P(option_array), option_name, sizeof(option_name) - 1)) != NULL) { \
if (Z_TYPE_P(option_val) == IS_STRING) { \
var_name = Z_STRVAL_P(option_val); \
Expand Down
27 changes: 27 additions & 0 deletions ext/filter/tests/gh24579.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
GH-24579: FILTER_VALIDATE_INT should not crash when __toString() mutates options array
--EXTENSIONS--
filter
--FILE--
<?php

$shared = ['min_range' => 0];
$args = ['options' => &$shared];

class Reenter
{
public function __toString(): string
{
global $shared;
$shared = 'changed';
return '1';
}
}

var_dump(filter_var(new Reenter(), FILTER_VALIDATE_INT, $args));

echo "No crash\n";
?>
--EXPECT--
int(1)
No crash
Loading