summaryrefslogtreecommitdiff
path: root/treat_data.c
diff options
context:
space:
mode:
authorBen Fuhrmannek2016-02-22 22:02:32 +0100
committerBen Fuhrmannek2016-02-22 22:02:32 +0100
commitf365d212edbaab4058875fe39623a97befbf98b0 (patch)
tree9b791f1984a9e823e688b188d7596e3467930bdc /treat_data.c
parent86bd1f01211be780307d9269f23314721029fcab (diff)
temp. disabled treat_data to simplify things
Diffstat (limited to 'treat_data.c')
-rw-r--r--treat_data.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/treat_data.c b/treat_data.c
index 1c41e85..d842afc 100644
--- a/treat_data.c
+++ b/treat_data.c
@@ -144,6 +144,7 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
144 php_error_docref(NULL, E_WARNING, "Input variables exceeded " ZEND_LONG_FMT ". To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); 144 php_error_docref(NULL, E_WARNING, "Input variables exceeded " ZEND_LONG_FMT ". To increase the limit change max_input_vars in php.ini.", PG(max_input_vars));
145 break; 145 break;
146 } 146 }
147 SDEBUG("calling input filter from treat_data");
147 148
148 if (val) { /* have a value */ 149 if (val) { /* have a value */
149 size_t val_len; 150 size_t val_len;
@@ -154,9 +155,9 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
154 val_len = php_url_decode(val, strlen(val)); 155 val_len = php_url_decode(val, strlen(val));
155 val = estrndup(val, val_len); 156 val = estrndup(val, val_len);
156 if (suhosin_input_filter(arg, var, &val, val_len, &new_val_len)) { 157 if (suhosin_input_filter(arg, var, &val, val_len, &new_val_len)) {
157 if (sapi_module.input_filter(arg, var, &val, new_val_len, &new_val_len)) { 158 // if (sapi_module.input_filter(arg, var, &val, new_val_len, &new_val_len)) {
158 php_register_variable_safe(var, val, new_val_len, &array); 159 php_register_variable_safe(var, val, new_val_len, &array);
159 } 160 // }
160 } else { 161 } else {
161 SUHOSIN7_G(abort_request) = 1; 162 SUHOSIN7_G(abort_request) = 1;
162 } 163 }
@@ -169,9 +170,9 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
169 val_len = 0; 170 val_len = 0;
170 val = estrndup("", val_len); 171 val = estrndup("", val_len);
171 if (suhosin_input_filter(arg, var, &val, val_len, &new_val_len)) { 172 if (suhosin_input_filter(arg, var, &val, val_len, &new_val_len)) {
172 if (sapi_module.input_filter(arg, var, &val, new_val_len, &new_val_len)) { 173 // if (sapi_module.input_filter(arg, var, &val, new_val_len, &new_val_len)) {
173 php_register_variable_safe(var, val, new_val_len, &array); 174 php_register_variable_safe(var, val, new_val_len, &array);
174 } 175 // }
175 } else { 176 } else {
176 SUHOSIN7_G(abort_request) = 1; 177 SUHOSIN7_G(abort_request) = 1;
177 } 178 }
@@ -194,8 +195,8 @@ next_cookie:
194 195
195void suhosin_hook_treat_data() 196void suhosin_hook_treat_data()
196{ 197{
197 sapi_register_treat_data(suhosin_treat_data); 198 // sapi_register_treat_data(suhosin_treat_data);
198 199
199 if (old_input_filter == NULL) { 200 if (old_input_filter == NULL) {
200 old_input_filter = sapi_module.input_filter; 201 old_input_filter = sapi_module.input_filter;
201 } 202 }