summaryrefslogtreecommitdiff
path: root/treat_data.c
diff options
context:
space:
mode:
authorBen Fuhrmannek2016-09-23 17:50:58 +0200
committerBen Fuhrmannek2016-09-23 17:50:58 +0200
commita42fdc6fa2406a16084f8d04ba6561f74c60fc0b (patch)
treee79a2afcc5bf6a676b9b0315f8af7b7a1a5ceeb7 /treat_data.c
parenta59b5e1a4f57ffe0d9fed7c646b345e39a898bbf (diff)
whitespace
Diffstat (limited to 'treat_data.c')
-rw-r--r--treat_data.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/treat_data.c b/treat_data.c
index 0008a7a..a838b89 100644
--- a/treat_data.c
+++ b/treat_data.c
@@ -17,7 +17,7 @@
17 +----------------------------------------------------------------------+ 17 +----------------------------------------------------------------------+
18*/ 18*/
19/* 19/*
20 $Id: treat_data.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ 20 $Id: treat_data.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $
21*/ 21*/
22 22
23#ifdef HAVE_CONFIG_H 23#ifdef HAVE_CONFIG_H
@@ -38,12 +38,12 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
38 zval *array_ptr; 38 zval *array_ptr;
39 int free_buffer = 0; 39 int free_buffer = 0;
40 char *strtok_buf = NULL; 40 char *strtok_buf = NULL;
41 41
42 long count = 0; 42 long count = 0;
43 43
44 /* Mark that we were not yet called */ 44 /* Mark that we were not yet called */
45 SUHOSIN_G(already_scanned) = 0; 45 SUHOSIN_G(already_scanned) = 0;
46 46
47 switch (arg) { 47 switch (arg) {
48 case PARSE_POST: 48 case PARSE_POST:
49 case PARSE_GET: 49 case PARSE_GET:
@@ -57,9 +57,9 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
57 zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_POST]); 57 zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_POST]);
58 } 58 }
59 PG(http_globals)[TRACK_VARS_POST] = array_ptr; 59 PG(http_globals)[TRACK_VARS_POST] = array_ptr;
60 60
61 if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_post_vars) == 0 || 61 if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_post_vars) == 0 ||
62 SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_post_vars))) { 62 SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_post_vars))) {
63 SUHOSIN_G(max_post_vars) = SUHOSIN_G(max_request_variables); 63 SUHOSIN_G(max_post_vars) = SUHOSIN_G(max_request_variables);
64 } 64 }
65 break; 65 break;
@@ -68,8 +68,8 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
68 zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_GET]); 68 zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_GET]);
69 } 69 }
70 PG(http_globals)[TRACK_VARS_GET] = array_ptr; 70 PG(http_globals)[TRACK_VARS_GET] = array_ptr;
71 if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_get_vars) == 0 || 71 if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_get_vars) == 0 ||
72 SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_get_vars))) { 72 SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_get_vars))) {
73 SUHOSIN_G(max_get_vars) = SUHOSIN_G(max_request_variables); 73 SUHOSIN_G(max_get_vars) = SUHOSIN_G(max_request_variables);
74 } 74 }
75 break; 75 break;
@@ -78,10 +78,10 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
78 zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_COOKIE]); 78 zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_COOKIE]);
79 } 79 }
80 PG(http_globals)[TRACK_VARS_COOKIE] = array_ptr; 80 PG(http_globals)[TRACK_VARS_COOKIE] = array_ptr;
81 if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_cookie_vars) == 0 || 81 if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_cookie_vars) == 0 ||
82 SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_cookie_vars))) { 82 SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_cookie_vars))) {
83 SUHOSIN_G(max_cookie_vars) = SUHOSIN_G(max_request_variables); 83 SUHOSIN_G(max_cookie_vars) = SUHOSIN_G(max_request_variables);
84 } 84 }
85 break; 85 break;
86 } 86 }
87 break; 87 break;
@@ -133,11 +133,11 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
133 separator = ";\0"; 133 separator = ";\0";
134 break; 134 break;
135 } 135 }
136 136
137 var = php_strtok_r(res, separator, &strtok_buf); 137 var = php_strtok_r(res, separator, &strtok_buf);
138 138
139 while (var) { 139 while (var) {
140 140
141 if (arg == PARSE_COOKIE) { 141 if (arg == PARSE_COOKIE) {
142 /* Remove leading spaces from cookie names, needed for multi-cookie header where ; can be followed by a space */ 142 /* Remove leading spaces from cookie names, needed for multi-cookie header where ; can be followed by a space */
143 while (isspace(*var)) { 143 while (isspace(*var)) {
@@ -145,12 +145,12 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data)
145 } 145 }
146 } 146 }
147 val = strchr(var, '='); 147 val = strchr(var, '=');
148 148
149 if (++count > PG(max_input_vars)) { 149 if (++count > PG(max_input_vars)) {
150 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); 150 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars));
151 break; 151 break;
152 } 152 }
153 153
154 if (val) { /* have a value */ 154 if (val) { /* have a value */
155 int val_len; 155 int val_len;
156 unsigned int new_val_len; 156 unsigned int new_val_len;
@@ -217,5 +217,3 @@ void suhosin_hook_treat_data()
217 * vim600: noet sw=4 ts=4 fdm=marker 217 * vim600: noet sw=4 ts=4 fdm=marker
218 * vim<600: noet sw=4 ts=4 218 * vim<600: noet sw=4 ts=4
219 */ 219 */
220
221