summaryrefslogtreecommitdiff
path: root/src/sp_disabled_functions.c
diff options
context:
space:
mode:
authorjvoisin2018-10-06 11:26:32 +0200
committerjvoisin2018-10-06 11:26:32 +0200
commit228fadf307b167a22ad6ec760f3b2ee2e9f2fee3 (patch)
tree5aa52bad7cb0eb4e953a9d978f2ad32197dd2cb7 /src/sp_disabled_functions.c
parentfc6e2455c5fcc2a5ec365552fb8d89a9c0571154 (diff)
Remove sp_terminate and bump a bit the coverage
Diffstat (limited to '')
-rw-r--r--src/sp_disabled_functions.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index b8ec845..1589cd4 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -509,7 +509,7 @@ ZEND_FUNCTION(check_disabled_function) {
509 SNUFFLEUPAGUS_G(config) 509 SNUFFLEUPAGUS_G(config)
510 .config_disabled_functions_reg->disabled_functions, 510 .config_disabled_functions_reg->disabled_functions,
511 SNUFFLEUPAGUS_G(config).config_disabled_functions_hooked)) { 511 SNUFFLEUPAGUS_G(config).config_disabled_functions_hooked)) {
512 sp_terminate(); 512 zend_bailout();
513 } 513 }
514 514
515 orig_handler = zend_hash_str_find_ptr( 515 orig_handler = zend_hash_str_find_ptr(
@@ -523,7 +523,7 @@ ZEND_FUNCTION(check_disabled_function) {
523 .config_disabled_functions_reg_ret->disabled_functions, 523 .config_disabled_functions_reg_ret->disabled_functions,
524 SNUFFLEUPAGUS_G(config).config_disabled_functions_ret_hooked, 524 SNUFFLEUPAGUS_G(config).config_disabled_functions_ret_hooked,
525 execute_data)) { 525 execute_data)) {
526 sp_terminate(); 526 zend_bailout();
527 } 527 }
528} 528}
529 529
@@ -594,7 +594,7 @@ ZEND_FUNCTION(eval_blacklist_callback) {
594 sp_log_msg("eval", SP_LOG_DROP, 594 sp_log_msg("eval", SP_LOG_DROP,
595 "A call to %s was tried in eval, in %s:%d, dropping it.", 595 "A call to %s was tried in eval, in %s:%d, dropping it.",
596 current_function_name, ZSTR_VAL(filename), line_number); 596 current_function_name, ZSTR_VAL(filename), line_number);
597 sp_terminate(); 597 zend_bailout();
598 } 598 }
599 efree(filename); 599 efree(filename);
600 } 600 }
@@ -653,7 +653,7 @@ int hook_echo(const char* str, size_t str_length) {
653 zend_string_release(zs); 653 zend_string_release(zs);
654 654
655 if (ret) { 655 if (ret) {
656 sp_terminate(); 656 zend_bailout();
657 } 657 }
658 658
659 return zend_write_default(str, str_length); 659 return zend_write_default(str, str_length);