From a42fdc6fa2406a16084f8d04ba6561f74c60fc0b Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Fri, 23 Sep 2016 17:50:58 +0200 Subject: whitespace --- treat_data.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'treat_data.c') 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 @@ +----------------------------------------------------------------------+ */ /* - $Id: treat_data.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ + $Id: treat_data.c,v 1.1.1.1 2007-11-28 01:15:35 sesser Exp $ */ #ifdef HAVE_CONFIG_H @@ -38,12 +38,12 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) zval *array_ptr; int free_buffer = 0; char *strtok_buf = NULL; - + long count = 0; /* Mark that we were not yet called */ SUHOSIN_G(already_scanned) = 0; - + switch (arg) { case PARSE_POST: case PARSE_GET: @@ -57,9 +57,9 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_POST]); } PG(http_globals)[TRACK_VARS_POST] = array_ptr; - - if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_post_vars) == 0 || - SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_post_vars))) { + + if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_post_vars) == 0 || + SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_post_vars))) { SUHOSIN_G(max_post_vars) = SUHOSIN_G(max_request_variables); } break; @@ -68,8 +68,8 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_GET]); } PG(http_globals)[TRACK_VARS_GET] = array_ptr; - if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_get_vars) == 0 || - SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_get_vars))) { + if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_get_vars) == 0 || + SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_get_vars))) { SUHOSIN_G(max_get_vars) = SUHOSIN_G(max_request_variables); } break; @@ -78,10 +78,10 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) zval_ptr_dtor(&PG(http_globals)[TRACK_VARS_COOKIE]); } PG(http_globals)[TRACK_VARS_COOKIE] = array_ptr; - if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_cookie_vars) == 0 || - SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_cookie_vars))) { + if (SUHOSIN_G(max_request_variables) && (SUHOSIN_G(max_cookie_vars) == 0 || + SUHOSIN_G(max_request_variables) <= SUHOSIN_G(max_cookie_vars))) { SUHOSIN_G(max_cookie_vars) = SUHOSIN_G(max_request_variables); - } + } break; } break; @@ -133,11 +133,11 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) separator = ";\0"; break; } - + var = php_strtok_r(res, separator, &strtok_buf); - + while (var) { - + if (arg == PARSE_COOKIE) { /* Remove leading spaces from cookie names, needed for multi-cookie header where ; can be followed by a space */ while (isspace(*var)) { @@ -145,12 +145,12 @@ SAPI_TREAT_DATA_FUNC(suhosin_treat_data) } } val = strchr(var, '='); - + if (++count > PG(max_input_vars)) { 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)); break; } - + if (val) { /* have a value */ int val_len; unsigned int new_val_len; @@ -217,5 +217,3 @@ void suhosin_hook_treat_data() * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - - -- cgit v1.3