summaryrefslogtreecommitdiff
path: root/src/sp_execute.c
diff options
context:
space:
mode:
authorjvoisin2018-01-05 11:07:15 +0100
committerjvoisin2018-01-05 11:07:15 +0100
commitc463edcee51dfab4358f1aff5a70c2f2f940a20b (patch)
treedd25db9755700294f4f15cb226a25e70df5b88d5 /src/sp_execute.c
parent3b113be573cdbca20ce9ec9c0a6efb25ccf51db5 (diff)
Fix a bypass in our eval blacklist
Diffstat (limited to 'src/sp_execute.c')
-rw-r--r--src/sp_execute.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sp_execute.c b/src/sp_execute.c
index a50bfd5..3ce6643 100644
--- a/src/sp_execute.c
+++ b/src/sp_execute.c
@@ -68,7 +68,7 @@ static void sp_execute_ex(zend_execute_data *execute_data) {
68 } 68 }
69 69
70 if (execute_data->func->op_array.type == ZEND_EVAL_CODE) { 70 if (execute_data->func->op_array.type == ZEND_EVAL_CODE) {
71 SNUFFLEUPAGUS_G(in_eval) = true; 71 SNUFFLEUPAGUS_G(in_eval)++;
72 sp_list_node *config = 72 sp_list_node *config =
73 SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_eval; 73 SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_eval;
74 char *filename = get_eval_filename((char *)zend_get_executed_filename()); 74 char *filename = get_eval_filename((char *)zend_get_executed_filename());
@@ -88,7 +88,7 @@ static void sp_execute_ex(zend_execute_data *execute_data) {
88 sp_terminate(); 88 sp_terminate();
89 } 89 }
90 90
91 SNUFFLEUPAGUS_G(in_eval) = false; 91 SNUFFLEUPAGUS_G(in_eval)--;
92} 92}
93 93
94static int sp_stream_open(const char *filename, zend_file_handle *handle) { 94static int sp_stream_open(const char *filename, zend_file_handle *handle) {