From: Jean-Frederic Clere <jfclere@apache.org>
Date: Sat, 29 Jul 2006 00:27:13 +0000 (+0000)
Subject: Use apr_pstrcat instead strcpy + strcat ...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8cb409f89331f24529727d3a99492079a3c2f55;p=thirdparty%2Fapache%2Fhttpd.git

Use apr_pstrcat instead strcpy + strcat ...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426718 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/proxymonitor.c b/support/proxymonitor.c
index 6619c22f4fe..3634c56c559 100644
--- a/support/proxymonitor.c
+++ b/support/proxymonitor.c
@@ -92,9 +92,7 @@ char * ap_server_root_relative(apr_pool_t *p, const char *name)
     /* XXX: apr_filepath_merge better ? */
     if (basedir && name[0] != '/') {
         fname = apr_pcalloc(p, strlen(basedir)+strlen(name)+1);
-        strcpy(fname, basedir);
-        strcat(fname, "/");
-        strcat(fname, name);
+        apr_pstrcat(fname, basedir, "/", name, NULL);
     } else {
         fname = apr_pstrdup(p, name);
     }