github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed return codes for base64Decode, base64Encode, compressWhitespace as well as replaceComments not adding the space for a comment w/o ending. See #439.

Browse Source
This commit is contained in:
brectanus 2007-12-20 22:59:26 +00:00
parent ef18503f05
commit a210e73257
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apache2/re_tfns.c
View File

@ -158,13 +158,16 @@ static int msre_fn_compressWhitespace_execute(apr_pool_t *mptmp, unsigned char *
{ {
long int i, j, count; long int i, j, count;
int changed = 0; int changed = 0;
int inwhitespace = 0;
i = j = count = 0; i = j = count = 0;
while(i < input_len) { while(i < input_len) {
if (isspace(input[i])||(input[i] == NBSP)) { if (isspace(input[i])||(input[i] == NBSP)) {
changed = 1; if (inwhitespace) changed = 1;
inwhitespace = 1;
count++; count++;
} else { } else {
inwhitespace = 0;
if (count) { if (count) {
input[j] = ' '; input[j] = ' ';
count = 0; count = 0;
@ -245,6 +248,10 @@ static int msre_fn_replaceComments_execute(apr_pool_t *mptmp, unsigned char *inp
} }
} }
if (incomment) {
input[j++] = ' ';
}
*rval = (char *)input; *rval = (char *)input;
*rval_len = j; *rval_len = j;
@ -315,7 +322,7 @@ static int msre_fn_base64Encode_execute(apr_pool_t *mptmp, unsigned char *input,
apr_base64_encode(*rval, (const char *)input, input_len); apr_base64_encode(*rval, (const char *)input, input_len);
(*rval_len)--; (*rval_len)--;
return 1; return *rval_len ? 1 : 0;
} }
/* base64Decode */ /* base64Decode */
@ -327,7 +334,7 @@ static int msre_fn_base64Decode_execute(apr_pool_t *mptmp, unsigned char *input,
*rval = apr_palloc(mptmp, *rval_len); *rval = apr_palloc(mptmp, *rval_len);
*rval_len = apr_base64_decode(*rval, (const char *)input); *rval_len = apr_base64_decode(*rval, (const char *)input);
return 1; return *rval_len ? 1 : 0;
} }
/* length */ /* length */