summaryrefslogtreecommitdiff
path: root/src/sp_execute.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sp_execute.c')
-rw-r--r--src/sp_execute.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sp_execute.c b/src/sp_execute.c
index 60d63ab..6ed87cb 100644
--- a/src/sp_execute.c
+++ b/src/sp_execute.c
@@ -27,7 +27,7 @@ ZEND_COLD static inline void terminate_if_writable(const char *filename) {
27 } else { 27 } else {
28 sp_log_msg("readonly_exec", SP_LOG_DROP, 28 sp_log_msg("readonly_exec", SP_LOG_DROP,
29 "Attempted execution of a writable file (%s).", filename); 29 "Attempted execution of a writable file (%s).", filename);
30 sp_terminate(); 30 zend_bailout();
31 } 31 }
32 } else { 32 } else {
33 if (EACCES != errno) { 33 if (EACCES != errno) {
@@ -52,7 +52,7 @@ inline static void is_builtin_matching(
52 SNUFFLEUPAGUS_G(config) 52 SNUFFLEUPAGUS_G(config)
53 .config_disabled_functions_reg->disabled_functions, 53 .config_disabled_functions_reg->disabled_functions,
54 ht)) { 54 ht)) {
55 sp_terminate(); 55 zend_bailout();
56 } 56 }
57} 57}
58 58
@@ -95,7 +95,7 @@ is_in_eval_and_whitelisted(const zend_execute_data *execute_data) {
95 "Eval_whitelist", SP_LOG_DROP, 95 "Eval_whitelist", SP_LOG_DROP,
96 "The function '%s' isn't in the eval whitelist, dropping its call.", 96 "The function '%s' isn't in the eval whitelist, dropping its call.",
97 ZSTR_VAL(current_function)); 97 ZSTR_VAL(current_function));
98 sp_terminate(); 98 zend_bailout();
99 } 99 }
100 } 100 }
101 } 101 }
@@ -170,7 +170,7 @@ static void sp_execute_ex(zend_execute_data *execute_data) {
170 should_disable_ht(execute_data, function_name, NULL, NULL, 170 should_disable_ht(execute_data, function_name, NULL, NULL,
171 config_disabled_functions_reg, 171 config_disabled_functions_reg,
172 config_disabled_functions))) { 172 config_disabled_functions))) {
173 sp_terminate(); 173 zend_bailout();
174 } 174 }
175 } else if ((execute_data->prev_execute_data->opline->opcode == 175 } else if ((execute_data->prev_execute_data->opline->opcode ==
176 ZEND_DO_FCALL || 176 ZEND_DO_FCALL ||
@@ -182,7 +182,7 @@ static void sp_execute_ex(zend_execute_data *execute_data) {
182 should_disable_ht(execute_data, function_name, NULL, NULL, 182 should_disable_ht(execute_data, function_name, NULL, NULL,
183 config_disabled_functions_reg, 183 config_disabled_functions_reg,
184 config_disabled_functions))) { 184 config_disabled_functions))) {
185 sp_terminate(); 185 zend_bailout();
186 } 186 }
187 } 187 }
188 188
@@ -203,7 +203,7 @@ static void sp_execute_ex(zend_execute_data *execute_data) {
203 .config_disabled_functions_reg_ret->disabled_functions, 203 .config_disabled_functions_reg_ret->disabled_functions,
204 SNUFFLEUPAGUS_G(config).config_disabled_functions_ret, 204 SNUFFLEUPAGUS_G(config).config_disabled_functions_ret,
205 execute_data))) { 205 execute_data))) {
206 sp_terminate(); 206 zend_bailout();
207 } 207 }
208 efree(function_name); 208 efree(function_name);
209 209