summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjvoisin2018-10-06 22:46:12 +0200
committerjvoisin2018-10-06 22:46:12 +0200
commit2d615f1fac1a78012c0cce2e4e9f87c8e6df05b6 (patch)
tree5a2f1c95d33aa1d22942f7e25250fd23be3e01e3 /src
parentb348899e1ee33a639ccf06e08e6abca4332776da (diff)
Bump coverage again
Diffstat (limited to '')
-rw-r--r--src/sp_execute.c3
-rw-r--r--src/sp_session.c8
-rw-r--r--src/sp_utils.c2
-rw-r--r--src/sp_var_value.c2
4 files changed, 7 insertions, 8 deletions
diff --git a/src/sp_execute.c b/src/sp_execute.c
index 6def91b..e631f7b 100644
--- a/src/sp_execute.c
+++ b/src/sp_execute.c
@@ -98,7 +98,6 @@ is_in_eval_and_whitelisted(const zend_execute_data *execute_data) {
98 "Eval_whitelist", SP_LOG_DROP, 98 "Eval_whitelist", SP_LOG_DROP,
99 "The function '%s' isn't in the eval whitelist, dropping its call.", 99 "The function '%s' isn't in the eval whitelist, dropping its call.",
100 ZSTR_VAL(current_function)); 100 ZSTR_VAL(current_function));
101 zend_bailout();
102 } 101 }
103 } 102 }
104 } 103 }
@@ -130,7 +129,7 @@ static void sp_execute_ex(zend_execute_data *execute_data) {
130 SNUFFLEUPAGUS_G(config).config_disabled_functions; 129 SNUFFLEUPAGUS_G(config).config_disabled_functions;
131 130
132 if (!execute_data) { 131 if (!execute_data) {
133 return; 132 return; // LCOV_EXCL_LINE
134 } 133 }
135 134
136 if (UNEXPECTED(EX(func)->op_array.type == ZEND_EVAL_CODE)) { 135 if (UNEXPECTED(EX(func)->op_array.type == ZEND_EVAL_CODE)) {
diff --git a/src/sp_session.c b/src/sp_session.c
index 73fda22..550b83d 100644
--- a/src/sp_session.c
+++ b/src/sp_session.c
@@ -69,13 +69,13 @@ static void sp_hook_session_module() {
69 ps_module *mod; 69 ps_module *mod;
70 70
71 if (old_mod == NULL || s_module == old_mod) { 71 if (old_mod == NULL || s_module == old_mod) {
72 return; 72 return; // LCOV_EXCL_LINE
73 } 73 }
74 74
75 if (s_module == NULL) { 75 if (s_module == NULL) {
76 s_module = mod = malloc(sizeof(ps_module)); 76 s_module = mod = malloc(sizeof(ps_module));
77 if (mod == NULL) { 77 if (mod == NULL) {
78 return; 78 return; // LCOV_EXCL_LINE
79 } 79 }
80 } 80 }
81 81
@@ -129,7 +129,7 @@ void hook_session() {
129 129
130 if ((module = zend_hash_str_find_ptr(&module_registry, 130 if ((module = zend_hash_str_find_ptr(&module_registry,
131 ZEND_STRL("session"))) == NULL) { 131 ZEND_STRL("session"))) == NULL) {
132 return; 132 return; // LCOV_EXCL_LINE
133 } 133 }
134 134
135#ifdef ZTS 135#ifdef ZTS
@@ -142,7 +142,7 @@ void hook_session() {
142 } 142 }
143#endif 143#endif
144 if (old_OnUpdateSaveHandler != NULL) { 144 if (old_OnUpdateSaveHandler != NULL) {
145 return; 145 return; // LCOV_EXCL_LINE
146 } 146 }
147 147
148 previous_sessionRINIT = module->request_startup_func; 148 previous_sessionRINIT = module->request_startup_func;
diff --git a/src/sp_utils.c b/src/sp_utils.c
index 6634a8e..3def6da 100644
--- a/src/sp_utils.c
+++ b/src/sp_utils.c
@@ -183,7 +183,7 @@ const zend_string* sp_zval_to_zend_string(const zval* zv) {
183 return zend_string_init("ARRAY", sizeof("ARRAY") - 1, 0); 183 return zend_string_init("ARRAY", sizeof("ARRAY") - 1, 0);
184 case IS_RESOURCE: 184 case IS_RESOURCE:
185 return zend_string_init("RESOURCE", sizeof("RESOURCE") - 1, 0); 185 return zend_string_init("RESOURCE", sizeof("RESOURCE") - 1, 0);
186 default: 186 default: // LCOV_EXCL_LINE
187 return zend_string_init("", 0, 0); // LCOV_EXCL_LINE 187 return zend_string_init("", 0, 0); // LCOV_EXCL_LINE
188 } 188 }
189} 189}
diff --git a/src/sp_var_value.c b/src/sp_var_value.c
index 268c3d1..7f08c46 100644
--- a/src/sp_var_value.c
+++ b/src/sp_var_value.c
@@ -59,7 +59,7 @@ static zval *get_constant(const char *value) {
59static zval *get_var_value(zend_execute_data *ed, const char *var_name, 59static zval *get_var_value(zend_execute_data *ed, const char *var_name,
60 bool is_param) { 60 bool is_param) {
61 if (!var_name) { 61 if (!var_name) {
62 return NULL; 62 return NULL; // LCOV_EXCL_LINE
63 } 63 }
64 64
65 if (*var_name != VARIABLE_TOKEN) { 65 if (*var_name != VARIABLE_TOKEN) {