Code cleanup: replace strncpy by apr_cpystrn or apr_pstrmemdup

Submitted by: Takashi Sato <takashi lans tv com>
PR: 43432

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

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 8a2c65e30ba598f7f34a5bc4c8221e16c7d77851..a1cad924deac807fef7d52d44be1fb7bb0f04976 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -2313,9 +2313,7 @@ static char *do_expand(char *input, rewrite_ctx *ctx, rewriterule_entry *entry)
                 if (entry && (entry->flags & RULEFLAG_ESCAPEBACKREF)) {
                     /* escape the backreference */
                     char *tmp2, *tmp;
-                    tmp = apr_palloc(pool, span + 1);
-                    strncpy(tmp, bri->source + bri->regmatch[n].rm_so, span);
-                    tmp[span] = '\0';
+                    tmp = apr_pstrmemdup(pool, bri->source + bri->regmatch[n].rm_so, span);
                     tmp2 = escape_uri(pool, tmp);
                     rewritelog((ctx->r, 5, ctx->perdir, "escaping backreference '%s' to '%s'",
                             tmp, tmp2));

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index fde91cadff0e2cc85333681fb1822d01eeac6036..f9ef86f7ce22eadbcb82e14ff67f48ecf8e07617 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -1275,8 +1275,7 @@ static int parse(server_rec *serv, apr_pool_t *p, char *l, int lineno)
     }
     else
         m->nospflag = 0;
-    strncpy(m->desc, l, sizeof(m->desc) - 1);
-    m->desc[sizeof(m->desc) - 1] = '\0';
+    apr_cpystrn(m->desc, l, sizeof(m->desc));
 
 #if MIME_MAGIC_DEBUG
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, serv,

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index a71b6e33feef5de39a928a4b9f8c0fe985d7e9aa..482509737b0f8e5d513713986029eb701484c082 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -1197,7 +1197,7 @@ static int CommandLineInterpreter(scr_t screenID, const char *commandLine)
     if (strlen(commandLine) <= strlen(szCommand))
         return NOTMYCOMMAND;
 
-    strncpy (szcommandLine, commandLine, sizeof(szcommandLine)-1);
+    apr_cpystrn(szcommandLine, commandLine, sizeof(szcommandLine));
 
     /*  All added commands begin with "APACHE2 " */
 

diff --git a/server/util_pcre.c b/server/util_pcre.c
index c69c978503c9341ce64d90f3b40a5935996915db..089c6d360b97b6a5bb7f5b4783410ce7b3c46bb2 100644 (file)
--- a/server/util_pcre.c
+++ b/server/util_pcre.c
@@ -85,10 +85,7 @@ if (errbuf_size > 0)
       apr_snprintf(errbuf, sizeof errbuf,
                    "%s%s%-6d", message, addmessage, (int)preg->re_erroffset);
   else
-    {
-    strncpy(errbuf, message, errbuf_size - 1);
-    errbuf[errbuf_size-1] = 0;
-    }
+    apr_cpystrn(errbuf, message, errbuf_size);
   }
 
 return length + addlength;