Various code cleanup

Stefan Fritsch · Stefan Fritsch · commit 73d084416798 · 2011-06-22T20:45:34.000Z
PR: 51398 Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138627 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
@@ -1378,8 +1378,8 @@ static const char *mod_auth_ldap_parse_url(cmd_parms *cmd,
              * Get rid of the surrounding parens; later on when generating the
              * filter, they'll be put back.
              */
-            sec->filter = apr_pstrdup(cmd->pool, urld->lud_filter+1);
-            sec->filter[strlen(sec->filter)-1] = '\0';
+            sec->filter = apr_pstrmemdup(cmd->pool, urld->lud_filter+1,
+                                                    strlen(urld->lud_filter)-2);
         }
         else {
             sec->filter = apr_pstrdup(cmd->pool, urld->lud_filter);
diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
@@ -770,7 +770,7 @@ static int hm_handler(request_rec *r)
 
     ap_set_content_type(r, "text/plain");
     ap_set_content_length(r, 2);
-    ap_rprintf(r, "OK");
+    ap_rputs("OK", r);
     ap_rflush(r);
 
     return OK;
diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c
@@ -719,8 +719,7 @@ static dav_error * dav_fs_get_resource(
     /* make sure the URI does not have a trailing "/" */
     len = strlen(r->uri);
     if (len > 1 && r->uri[len - 1] == '/') {
-        s = apr_pstrdup(r->pool, r->uri);
-        s[len - 1] = '\0';
+        s = apr_pstrmemdup(r->pool, r->uri, len-1);
         resource->uri = s;
     }
     else {
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
@@ -160,8 +160,8 @@ static void *dav_create_dir_config(apr_pool_t *p, char *dir)
         char *d;
         apr_size_t l;
 
-        d = apr_pstrdup(p, dir);
-        l = strlen(d);
+        l = strlen(dir);
+        d = apr_pstrmemdup(p, dir, l);
         if (l > 1 && d[l - 1] == '/')
             d[l - 1] = '\0';
         conf->dir = d;
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
@@ -1759,7 +1759,7 @@ static char *lookup_variable(char *var, rewrite_ctx *ctx)
 
     /* fast exit */
     if (varlen < 4) {
-        return apr_pstrdup(r->pool, "");
+        return "";
     }
 
     result = NULL;
@@ -2211,7 +2211,7 @@ static char *do_expand(char *input, rewrite_ctx *ctx, rewriterule_entry *entry)
 
     /* fast exit */
     if (inputlen == span) {
-        return apr_pstrdup(pool, input);
+        return apr_pstrmemdup(pool, input, inputlen);
     }
 
     /* well, actually something to do */
diff --git a/modules/proxy/mod_serf.c b/modules/proxy/mod_serf.c
@@ -634,8 +634,7 @@ static int serf_handler(request_rec *r)
 
 static int is_true(const char *w)
 {
-    if (strcasecmp(w, "on") == 0 || 
-        strcasecmp(w, "1") == 0 ||
+    if (strcasecmp(w, "on") == 0 || strcmp(w, "1") == 0 ||
         strcasecmp(w, "true") == 0)
     {
         return 1;
@@ -678,8 +677,7 @@ static const char *add_pass(cmd_parms *cmd, void *vconf,
         const char *x = ap_strchr_c(p, '=');
         
         if (x) {
-            char *key = apr_pstrndup(cmd->pool, p, x-p);
-            if (strcmp(key, "preservehost") == 0) {
+            if (strncmp(p, "preservehost", x-p) == 0) {
                 conf->preservehost = is_true(x+1);
             }
         }
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
@@ -1682,8 +1682,8 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_get_worker(apr_pool_t *p,
         return NULL;
     }
 
-    url_copy = apr_pstrdup(p, url);
     url_length = strlen(url);
+    url_copy = apr_pstrmemdup(p, url, url_length);
 
     /*
      * We need to find the start of the path and
diff --git a/server/util.c b/server/util.c
@@ -670,8 +670,9 @@ AP_DECLARE(char *) ap_getword_nulls(apr_pool_t *atrans, const char **line,
     char *res;
 
     if (!pos) {
-        res = apr_pstrdup(atrans, *line);
-        *line += strlen(*line);
+        size_t len = strlen(*line);
+        res = apr_pstrmemdup(atrans, *line, len);
+        *line += len;
         return res;
     }
 
diff --git a/server/vhost.c b/server/vhost.c
@@ -158,9 +158,9 @@ static const char *get_addresses(apr_pool_t *p, const char *w_,
     if (*w_ == '\0')
         return NULL;
 
-    w = apr_pstrdup(p, w_);
+    wlen = strlen(w_);                   /* wlen must be > 0 at this point */
+    w = apr_pstrmemdup(p, w_, wlen);
     /* apr_parse_addr_port() doesn't understand ":*" so handle that first. */
-    wlen = strlen(w);                    /* wlen must be > 0 at this point */
     wild_port = 0;
     if (w[wlen - 1] == '*') {
         if (wlen < 2) {

Original file line number	Diff line number	Diff line change
`@@ -1759,7 +1759,7 @@ static char lookup_variable(char var, rewrite_ctx *ctx)`
`1759`	`1759`
`1760`	`1760`	`/* fast exit */`
`1761`	`1761`	`if (varlen < 4) {`
`1762`		`- return apr_pstrdup(r->pool, "");`
	`1762`	`+ return "";`
`1763`	`1763`	`}`
`1764`	`1764`
`1765`	`1765`	`result = NULL;`
`@@ -2211,7 +2211,7 @@ static char do_expand(char input, rewrite_ctx ctx, rewriterule_entry entry)`
`2211`	`2211`
`2212`	`2212`	`/* fast exit */`
`2213`	`2213`	`if (inputlen == span) {`
`2214`		`- return apr_pstrdup(pool, input);`
	`2214`	`+ return apr_pstrmemdup(pool, input, inputlen);`
`2215`	`2215`	`}`
`2216`	`2216`
`2217`	`2217`	`/* well, actually something to do */`
Original file line number	Diff line number	Diff line change
`@@ -634,8 +634,7 @@ static int serf_handler(request_rec *r)`
`634`	`634`
`635`	`635`	`static int is_true(const char *w)`
`636`	`636`	`{`
`637`		`- if (strcasecmp(w, "on") == 0 \|\|`
`638`		`- strcasecmp(w, "1") == 0 \|\|`
	`637`	`+ if (strcasecmp(w, "on") == 0 \|\| strcmp(w, "1") == 0 \|\|`
`639`	`638`	`strcasecmp(w, "true") == 0)`
`640`	`639`	`{`
`641`	`640`	`return 1;`
`@@ -678,8 +677,7 @@ static const char add_pass(cmd_parms cmd, void *vconf,`
`678`	`677`	`const char *x = ap_strchr_c(p, '=');`
`679`	`678`
`680`	`679`	`if (x) {`
`681`		`- char *key = apr_pstrndup(cmd->pool, p, x-p);`
`682`		`- if (strcmp(key, "preservehost") == 0) {`
	`680`	`+ if (strncmp(p, "preservehost", x-p) == 0) {`
`683`	`681`	`conf->preservehost = is_true(x+1);`
`684`	`682`	`}`
`685`	`683`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1682,8 +1682,8 @@ PROXY_DECLARE(proxy_worker ) ap_proxy_get_worker(apr_pool_t p,`
`1682`	`1682`	`return NULL;`
`1683`	`1683`	`}`
`1684`	`1684`
`1685`		`- url_copy = apr_pstrdup(p, url);`
`1686`	`1685`	`url_length = strlen(url);`
	`1686`	`+ url_copy = apr_pstrmemdup(p, url, url_length);`
`1687`	`1687`
`1688`	`1688`	`/*`
`1689`	`1689`	`* We need to find the start of the path and`