Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a...

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

diff --git a/server/util_regex.c b/server/util_regex.c
index 81eac5308d28c8095209bdda1f6cb38ff972cd4b..2a30d68176961369c7db2b2fd8f3cbab1f8c81d1 100644 (file)
--- a/server/util_regex.c
+++ b/server/util_regex.c
@@ -46,6 +46,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
     ap_rxplus_t *ret = apr_pcalloc(pool, sizeof(ap_rxplus_t));
     char delim = 0;
     enum { SUBSTITUTE = 's', MATCH = 'm'} action = MATCH;
+
     if (!apr_isalnum(pattern[0])) {
         delim = *str++;
     }
@@ -65,7 +66,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
     if (delim) {
         endp = ap_strchr_c(str, delim);
     }
-    if (!endp) { /* there's no delim  or flags */
+    if (!endp) { /* there's no delim or flags */
         if (ap_regcomp(&ret->rx, pattern, 0) == 0) {
             apr_pool_cleanup_register(pool, &ret->rx, rxplus_cleanup,
                                       apr_pool_cleanup_null);
@@ -77,7 +78,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
     }
 
     /* We have a delimiter.  Use it to extract the regexp */
-    rxstr = apr_pstrndup(pool, str, endp-str);
+    rxstr = apr_pstrmemdup(pool, str, endp-str);
 
     /* If it's a substitution, we need the replacement string
      * TODO: possible future enhancement - support other parsing
@@ -89,7 +90,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
             /* missing replacement string is an error */
             return NULL;
         }
-        ret->subs = apr_pstrndup(pool, str, (endp-str));
+        ret->subs = apr_pstrmemdup(pool, str, endp-str);
     }
 
     /* anything after the current delimiter is flags */