Fix a SIGSEGV on user-created function's return value

3 files changed, 32 insertions, 0 deletions

diff --git a/src/tests/config/config_disabled_functions_ret_user.ini b/src/tests/config/config_disabled_functions_ret_user.ini
new file mode 100644
index 0000000..d214376
--- /dev/null
+++ b/src/tests/config/config_disabled_functions_ret_user.ini
@@ -0,0 +1 @@
+sp.disable_function.function("qwe").ret("asd").drop();
diff --git a/src/tests/disabled_functions_ret_user.phpt b/src/tests/disabled_functions_ret_user.phpt
new file mode 100644
index 0000000..597a6b8
--- /dev/null
+++ b/src/tests/disabled_functions_ret_user.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Check NULL return value for user func
+--SKIPIF--
+<?php if (!extension_loaded("snuffleupagus")) die "skip"; ?>
+--INI--
+sp.configuration_file={PWD}/config/config_disabled_functions_ret_user.ini
+--FILE--
+<?php 
+function qwe() {
+  return "asd";
+}
+qwe();
+echo 1;
+?>
+--EXPECT--
+1
diff --git a/src/tests/disabled_functions_ret_user_used.phpt b/src/tests/disabled_functions_ret_user_used.phpt
new file mode 100644
index 0000000..7524b45
--- /dev/null
+++ b/src/tests/disabled_functions_ret_user_used.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Check return value for user func
+--SKIPIF--
+<?php if (!extension_loaded("snuffleupagus")) die "skip"; ?>
+--INI--
+sp.configuration_file={PWD}/config/config_disabled_functions_ret_user.ini
+--FILE--
+<?php 
+function qwe() {
+  return "asd";
+}
+echo qwe();
+?>
+--EXPECTF--
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/tests/disabled_functions_ret_user_used.php on line %d