From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 3 Oct 2017 09:23:32 +0000 (+0000)
Subject: apr_expr: follow up to r1810605.
X-Git-Tag: 2.5.0-alpha~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f6af33ff1557c2d1469c6c2a3b79cfa25293bc9;p=apache

apr_expr: follow up to r1810605.

Not necessarily ASCII here..



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1810702 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 8500fa26d9..3898566e53 100644
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -365,8 +365,7 @@ static const char *ap_expr_regexec(const char *subject,
             if (list) {
                 char *tmp = apr_palloc(ctx->p, pos + len + 1);
                 memcpy(tmp, val, pos);
-                memcpy(tmp + pos, str, len);
-                tmp[pos + len] = '\0';
+                memcpy(tmp + pos, str, len + 1);
                 APR_ARRAY_PUSH(list, const char*) = tmp;
             }
             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
              * 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;
             }
             else {