VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-03 16:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

apr_expr: follow up to r1810605.

Browse Source 
Not necessarily ASCII here..



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810702 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2017-10-03 09:23:32 +00:00
parent 08ddf7ad0a
commit 4f6af33ff1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/util_expr_eval.c
View File

@ -365,8 +365,7 @@ static const char *ap_expr_regexec(const char *subject,
if (list) { if (list) {
char *tmp = apr_palloc(ctx->p, pos + len + 1); char *tmp = apr_palloc(ctx->p, pos + len + 1);
memcpy(tmp, val, pos); memcpy(tmp, val, pos);
memcpy(tmp + pos, str, len); memcpy(tmp + pos, str, len + 1);
tmp[pos + len] = '\0';
APR_ARRAY_PUSH(list, const char*) = tmp; APR_ARRAY_PUSH(list, const char*) = tmp;
} }
else { /* regctx->type == 's' */ else { /* regctx->type == 's' */
@ -387,7 +386,7 @@ static const char *ap_expr_regexec(const char *subject,
/* Skip this non-matching character (or CRLF) and restart /* Skip this non-matching character (or CRLF) and restart
* another "normal" match (possibly empty) from there. * another "normal" match (possibly empty) from there.
*/ */
if (val[0] == APR_ASCII_CR && val[1] == APR_ASCII_LF) { if (val[0] == '\r' && val[1] == '\n') {
val += 2; val += 2;
} }
else { else {