From d03c3c8d01f6f507bf844fec07477f30e3db61d9 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 23 Feb 2019 12:06:51 +0100 Subject: Fix the testsuite on php8. In php8, it's non-trivial to hook strlen, since this function is usually optimized away by the compiler. --- src/tests/eval_blacklist/config/eval_backlist.ini | 2 +- src/tests/eval_blacklist/config/eval_backlist_list.ini | 2 +- src/tests/eval_blacklist/config/eval_backlist_simulation.ini | 2 +- src/tests/eval_blacklist/eval_backlist.phpt | 8 ++++---- src/tests/eval_blacklist/eval_backlist_call_user_func.phpt | 4 ++-- src/tests/eval_blacklist/eval_backlist_chained.phpt | 4 ++-- src/tests/eval_blacklist/eval_backlist_list.phpt | 8 ++++---- src/tests/eval_blacklist/eval_backlist_simulation.phpt | 10 +++++----- src/tests/eval_blacklist/nested_eval_blacklist.phpt | 8 ++++---- src/tests/eval_blacklist/nested_eval_blacklist2.phpt | 8 ++++---- 10 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/tests/eval_blacklist') diff --git a/src/tests/eval_blacklist/config/eval_backlist.ini b/src/tests/eval_blacklist/config/eval_backlist.ini index b181598..53c2801 100644 --- a/src/tests/eval_blacklist/config/eval_backlist.ini +++ b/src/tests/eval_blacklist/config/eval_backlist.ini @@ -1 +1 @@ -sp.eval_blacklist.list("strlen"); +sp.eval_blacklist.list("strtoupper"); diff --git a/src/tests/eval_blacklist/config/eval_backlist_list.ini b/src/tests/eval_blacklist/config/eval_backlist_list.ini index b395d03..ffa281e 100644 --- a/src/tests/eval_blacklist/config/eval_backlist_list.ini +++ b/src/tests/eval_blacklist/config/eval_backlist_list.ini @@ -1 +1 @@ -sp.eval_blacklist.list("strcmp,strlen"); +sp.eval_blacklist.list("strcmp,strtoupper,strlen"); diff --git a/src/tests/eval_blacklist/config/eval_backlist_simulation.ini b/src/tests/eval_blacklist/config/eval_backlist_simulation.ini index 2d8dc73..bb8b5dd 100644 --- a/src/tests/eval_blacklist/config/eval_backlist_simulation.ini +++ b/src/tests/eval_blacklist/config/eval_backlist_simulation.ini @@ -1 +1 @@ -sp.eval_blacklist.list("strlen").simulation(); +sp.eval_blacklist.list("strtoupper").simulation(); diff --git a/src/tests/eval_blacklist/eval_backlist.phpt b/src/tests/eval_blacklist/eval_backlist.phpt index f24af96..1dbe887 100644 --- a/src/tests/eval_blacklist/eval_backlist.phpt +++ b/src/tests/eval_blacklist/eval_backlist.phpt @@ -6,12 +6,12 @@ Eval blacklist sp.configuration_file={PWD}/config/eval_backlist.ini --FILE-- --EXPECTF-- -Outside of eval: 14 +Outside of eval: 1337 1337 1337 -Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/eval_backlist.php:1, dropping it. in %a/eval_backlist.php(4) : eval()'d code on line 1 \ No newline at end of file +Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist.php:1, dropping it. in %a/eval_backlist.php(4) : eval()'d code on line 1 diff --git a/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt b/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt index 47e8d71..ac48515 100644 --- a/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt +++ b/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt @@ -7,8 +7,8 @@ sp.configuration_file={PWD}/config/eval_backlist.ini --FILE-- --EXPECTF-- -Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %s/eval_backlist_call_user_func.php:%d, dropping it. in %s/eval_backlist_call_user_func.php(%d) : eval()'d code on line %d +Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %s/eval_backlist_call_user_func.php:%d, dropping it. in %s/eval_backlist_call_user_func.php(%d) : eval()'d code on line %d diff --git a/src/tests/eval_blacklist/eval_backlist_chained.phpt b/src/tests/eval_blacklist/eval_backlist_chained.phpt index 2360e06..dc23857 100644 --- a/src/tests/eval_blacklist/eval_backlist_chained.phpt +++ b/src/tests/eval_blacklist/eval_backlist_chained.phpt @@ -8,9 +8,9 @@ sp.configuration_file={PWD}/config/eval_backlist.ini --EXPECTF-- -Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %s/eval_backlist_chained.php:%d, dropping it. in %s/eval_backlist_chained.php(%d) : eval()'d code on line %d +Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %s/eval_backlist_chained.php:%d, dropping it. in %s/eval_backlist_chained.php(%d) : eval()'d code on line %d diff --git a/src/tests/eval_blacklist/eval_backlist_list.phpt b/src/tests/eval_blacklist/eval_backlist_list.phpt index 5bf0ea8..d5bbd00 100644 --- a/src/tests/eval_blacklist/eval_backlist_list.phpt +++ b/src/tests/eval_blacklist/eval_backlist_list.phpt @@ -6,12 +6,12 @@ Eval blacklist - with a list of functions sp.configuration_file={PWD}/config/eval_backlist_list.ini --FILE-- --EXPECTF-- -Outside of eval: 14 +Outside of eval: 1337 1337 1337 -Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/eval_backlist_list.php:1, dropping it. in %a/eval_backlist_list.php(4) : eval()'d code on line 1 \ No newline at end of file +Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist_list.php:1, dropping it. in %a/eval_backlist_list.php(4) : eval()'d code on line 1 diff --git a/src/tests/eval_blacklist/eval_backlist_simulation.phpt b/src/tests/eval_blacklist/eval_backlist_simulation.phpt index 3089c2d..be4cd3a 100644 --- a/src/tests/eval_blacklist/eval_backlist_simulation.phpt +++ b/src/tests/eval_blacklist/eval_backlist_simulation.phpt @@ -6,13 +6,13 @@ Eval blacklist simulation sp.configuration_file={PWD}/config/eval_backlist_simulation.ini --FILE-- --EXPECTF-- -Outside of eval: 14 +Outside of eval: 1337 1337 1337 -Warning: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/eval_backlist_simulation.php:1, logging it. in %a/eval_backlist_simulation.php(4) : eval()'d code on line 1 -After eval: 4 \ No newline at end of file +Warning: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist_simulation.php:1, logging it. in %a/eval_backlist_simulation.php(4) : eval()'d code on line 1 +After eval: 1234 diff --git a/src/tests/eval_blacklist/nested_eval_blacklist.phpt b/src/tests/eval_blacklist/nested_eval_blacklist.phpt index 9671a65..244007e 100644 --- a/src/tests/eval_blacklist/nested_eval_blacklist.phpt +++ b/src/tests/eval_blacklist/nested_eval_blacklist.phpt @@ -6,7 +6,7 @@ Eval blacklist - nested eval sp.configuration_file={PWD}/config/eval_backlist.ini --FILE-- --EXPECTF-- -Outside of eval: 14 +Outside of eval: 1337 1337 1337 Inception lvl 1... Inception lvl 2... Inception lvl 3... -Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code:3, dropping it. in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code(4) : eval()'d code on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code:3, dropping it. in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code(4) : eval()'d code on line 3 diff --git a/src/tests/eval_blacklist/nested_eval_blacklist2.phpt b/src/tests/eval_blacklist/nested_eval_blacklist2.phpt index aee41db..9f7a4d0 100644 --- a/src/tests/eval_blacklist/nested_eval_blacklist2.phpt +++ b/src/tests/eval_blacklist/nested_eval_blacklist2.phpt @@ -6,7 +6,7 @@ Eval blacklist - nested eval, with a twist sp.configuration_file={PWD}/config/eval_backlist.ini --FILE-- --EXPECTF-- -Outside of eval: 14 +Outside of eval: 1337 1337 1337 Inception lvl 1... Inception lvl 2... Inception lvl 3... -Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/nested_eval_blacklist2.php(5) : eval()'d code:7, dropping it. in %a/nested_eval_blacklist2.php(5) : eval()'d code(4) : eval()'d code on line 7 \ No newline at end of file +Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/nested_eval_blacklist2.php(5) : eval()'d code:7, dropping it. in %a/nested_eval_blacklist2.php(5) : eval()'d code(4) : eval()'d code on line 7 -- cgit v1.3