Skip to content

Add zend_string INI validators #9328

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
wants to merge 3 commits into from
Closed

Add zend_string INI validators #9328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2744a04
Add zend_string INI validators
Girgias Aug 13, 2022
1c11276
Simplify code logic
Girgias Aug 19, 2022
860b418
Simplify in a similar fashion
Girgias Aug 19, 2022
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
20 changes: 20 additions & 0 deletions Zend/zend_ini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,3 +876,23 @@ ZEND_API ZEND_INI_MH(OnUpdateStringUnempty) /* {{{ */
return SUCCESS;
}
/* }}} */

ZEND_API ZEND_INI_MH(OnUpdateStr) /* {{{ */
{
zend_string **p = (zend_string **) ZEND_INI_GET_ADDR();
*p = new_value;
return SUCCESS;
}
/* }}} */

ZEND_API ZEND_INI_MH(OnUpdateStrNotEmpty) /* {{{ */
{
if (new_value && ZSTR_LEN(new_value) == 0) {
return FAILURE;
}

zend_string **p = (zend_string **) ZEND_INI_GET_ADDR();
*p = new_value;
return SUCCESS;
}
/* }}} */
4 changes: 4 additions & 0 deletions Zend/zend_ini.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,12 @@ ZEND_API ZEND_INI_MH(OnUpdateBool);
ZEND_API ZEND_INI_MH(OnUpdateLong);
ZEND_API ZEND_INI_MH(OnUpdateLongGEZero);
ZEND_API ZEND_INI_MH(OnUpdateReal);
/* char* versions */
ZEND_API ZEND_INI_MH(OnUpdateString);
ZEND_API ZEND_INI_MH(OnUpdateStringUnempty);
/* zend_string* versions */
ZEND_API ZEND_INI_MH(OnUpdateStr);
ZEND_API ZEND_INI_MH(OnUpdateStrNotEmpty);
END_EXTERN_C()

#define ZEND_INI_DISPLAY_ORIG 1
Expand Down
2 changes: 2 additions & 0 deletions ext/zend_test/php_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ ZEND_BEGIN_MODULE_GLOBALS(zend_test)
bool print_stderr_mshutdown;
zend_test_fiber *active_fiber;
zend_long quantity_value;
zend_string *str_test;
zend_string *not_empty_str_test;
ZEND_END_MODULE_GLOBALS(zend_test)

extern ZEND_DECLARE_MODULE_GLOBALS(zend_test)
Expand Down
9 changes: 9 additions & 0 deletions ext/zend_test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,13 @@ static ZEND_FUNCTION(zend_test_zend_ini_parse_uquantity)
}
}

static ZEND_FUNCTION(zend_test_zend_ini_str)
{
ZEND_PARSE_PARAMETERS_NONE();

RETURN_STR(ZT_G(str_test));
}

static ZEND_FUNCTION(namespaced_func)
{
ZEND_PARSE_PARAMETERS_NONE();
Expand Down Expand Up @@ -616,6 +623,8 @@ PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("zend_test.register_passes", "0", PHP_INI_SYSTEM, OnUpdateBool, register_passes, zend_zend_test_globals, zend_test_globals)
STD_PHP_INI_BOOLEAN("zend_test.print_stderr_mshutdown", "0", PHP_INI_SYSTEM, OnUpdateBool, print_stderr_mshutdown, zend_zend_test_globals, zend_test_globals)
STD_PHP_INI_ENTRY("zend_test.quantity_value", "0", PHP_INI_ALL, OnUpdateLong, quantity_value, zend_zend_test_globals, zend_test_globals)
STD_PHP_INI_ENTRY("zend_test.str_test", "", PHP_INI_ALL, OnUpdateStr, str_test, zend_zend_test_globals, zend_test_globals)
STD_PHP_INI_ENTRY("zend_test.not_empty_str_test", "val", PHP_INI_ALL, OnUpdateStrNotEmpty, not_empty_str_test, zend_zend_test_globals, zend_test_globals)
PHP_INI_END()

void (*old_zend_execute_ex)(zend_execute_data *execute_data);
Expand Down
2 changes: 2 additions & 0 deletions ext/zend_test/test.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ function zend_call_method(object|string $obj_or_class, string $method, mixed $ar

function zend_test_zend_ini_parse_quantity(string $str): int {}
function zend_test_zend_ini_parse_uquantity(string $str): int {}

function zend_test_zend_ini_str(): string {}
}

namespace ZendTestNS {
Expand Down
6 changes: 5 additions & 1 deletion ext/zend_test/test_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions ext/zend_test/tests/zend_ini_str_validator_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--TEST--
Test OnUpdateStr and OnUpdateStrNotEmpty validators.
--EXTENSIONS--
zend_test
--FILE--
<?php
echo 'str_test INI', PHP_EOL;
var_dump(ini_get("zend_test.str_test"));
var_dump(ini_set("zend_test.str_test", "Test"));
var_dump(ini_get("zend_test.str_test"));
var_dump(ini_set("zend_test.str_test", ""));
var_dump(ini_get("zend_test.str_test"));

echo 'not_empty_str_test INI', PHP_EOL;
var_dump(ini_get("zend_test.not_empty_str_test"));
var_dump(ini_set("zend_test.not_empty_str_test", "Test"));
var_dump(ini_get("zend_test.not_empty_str_test"));
var_dump(ini_set("zend_test.not_empty_str_test", ""));
var_dump(ini_get("zend_test.not_empty_str_test"));
?>
--EXPECT--
str_test INI
string(0) ""
string(0) ""
string(4) "Test"
string(4) "Test"
string(0) ""
not_empty_str_test INI
string(3) "val"
string(3) "val"
string(4) "Test"
bool(false)
string(4) "Test"
10 changes: 10 additions & 0 deletions ext/zend_test/tests/zend_ini_str_validator_return_from_func.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--TEST--
Test zend_test_zend_ini_str() to check for GC refcount on global returned
--EXTENSIONS--
zend_test
--FILE--
<?php
var_dump(zend_test_zend_ini_str());
?>
--EXPECT--
string(0) ""