Skip to content

Do not optimize out ini_get() when the entry does not exist during compilation #8507

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

Merged
merged 1 commit into from
May 13, 2022
Merged

Do not optimize out ini_get() when the entry does not exist during compilation #8507

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
4 changes: 4 additions & 0 deletions Zend/Optimizer/sccp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
+----------------------------------------------------------------------+
*/

#include "php.h"
#include "zend_API.h"
#include "zend_exceptions.h"
#include "zend_ini.h"
Expand Down Expand Up @@ -908,6 +909,9 @@ static inline int ct_eval_func_call(

ini_entry = zend_hash_find_ptr(EG(ini_directives), Z_STR_P(args[0]));
if (!ini_entry) {
if (PG(enable_dl)) {
return FAILURE;
}
ZVAL_FALSE(result);
} else if (ini_entry->modifiable != ZEND_INI_SYSTEM) {
return FAILURE;
Expand Down
23 changes: 23 additions & 0 deletions ext/opcache/tests/gh8466.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
Bug GH-8466: ini_get() is optimized out when the option does not exist during compilation
--SKIPIF--
<?php include dirname(__DIR__, 2) . "/dl_test/tests/skip.inc"; ?>
--FILE--
<?php

if (extension_loaded('dl_test')) {
exit('Error: dl_test is already loaded');
}

if (PHP_OS_FAMILY === 'Windows') {
$loaded = dl('php_dl_test.dll');
} else {
$loaded = dl('dl_test.so');
}

var_dump($loaded);

var_dump(ini_get('dl_test.long'));
--EXPECT--
bool(true)
string(1) "0"
5 changes: 2 additions & 3 deletions ext/standard/tests/general_functions/dl-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ var_dump($loaded);
dl_test_test1();
var_dump(dl_test_test2("World!"));

// ini_get() gets optimized out, so we use ini_get_all() here
var_dump(ini_get_all()["dl_test.long"]["local_value"]);
var_dump(ini_get_all()["dl_test.string"]["local_value"]);
var_dump(ini_get("dl_test.long"));
var_dump(ini_get("dl_test.string"));

echo "OK\n";
--EXPECT--
Expand Down
5 changes: 2 additions & 3 deletions ext/standard/tests/general_functions/dl-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ var_dump($loaded);
dl_test_test1();
var_dump(dl_test_test2("World!"));

// ini_get() gets optimized out, so we use ini_get_all() here
var_dump(ini_get_all()["dl_test.long"]["local_value"]);
var_dump(ini_get_all()["dl_test.string"]["local_value"]);
var_dump(ini_get("dl_test.long"));
var_dump(ini_get("dl_test.string"));

echo "OK\n";
--EXPECT--
Expand Down
5 changes: 2 additions & 3 deletions ext/standard/tests/general_functions/dl-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ var_dump(dl_test_test2("World!"));
ini_set("dl_test.long", "1");
ini_set("dl_test.string", "world");

// ini_get() gets optimized out, so we use ini_get_all() here
var_dump(ini_get_all()["dl_test.long"]["local_value"]);
var_dump(ini_get_all()["dl_test.string"]["local_value"]);
var_dump(ini_get("dl_test.long"));
var_dump(ini_get("dl_test.string"));

echo "OK\n";
--EXPECT--
Expand Down