fix the remaining sizeof(token.value) bogosity

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index ab89e5b36efb6c9918b7de2ac0628caec8b8a572..e8416e557c4c2b31bc3d8a777445ff9b0b3ecf19 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1899,18 +1899,12 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
             }
             switch (current->token.type) {
             case token_string:
-                if (current->token.value[0] != '\0') {
-                    strncat(current->token.value, " ",
-                         /* XXX sizeof() use is FUBAR */
-                         sizeof(current->token.value)
-                            - strlen(current->token.value) - 1);
-                }
-                strncat(current->token.value, new->token.value,
-                         /* XXX sizeof() use is FUBAR */
-                         sizeof(current->token.value)
-                            - strlen(current->token.value) - 1);
-                /* XXX sizeof() use is FUBAR */
-                current->token.value[sizeof(current->token.value) - 1] = '\0';
+                current->token.value = apr_pstrcat(r->pool,
+                                                   current->token.value,
+                                                   current->token.value[0] ? " " : "",
+                                                   new->token.value,
+                                                   NULL);
+                                                   
                 break;
             case token_eq:
             case token_ne: