From: Giovanni Bechis <gbechis@apache.org>
Date: Tue, 18 Feb 2020 07:37:45 +0000 (+0000)
Subject: convert malloc(3) into ap_malloc
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1641
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71e6fc9a3f27c96fee68a63c46cc95fbdeecc78;p=thirdparty%2Fapache%2Fhttpd.git

convert malloc(3) into ap_malloc
bz 64049


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

diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c
index e72749a756f..c50b07a0c1e 100644
--- a/modules/filters/mod_proxy_html.c
+++ b/modules/filters/mod_proxy_html.c
@@ -203,7 +203,7 @@ static void preserve(saxctxt *ctx, const size_t len)
     else while (len > (ctx->avail - ctx->offset))
         ctx->avail += ctx->cfg->bufsz;
 
-    newbuf = realloc(ctx->buf, ctx->avail);
+    newbuf = ap_realloc(ctx->buf, ctx->avail);
     if (newbuf != ctx->buf) {
         if (ctx->buf)
             apr_pool_cleanup_kill(ctx->f->r->pool, ctx->buf,
diff --git a/modules/ssl/ssl_ct_log_config.c b/modules/ssl/ssl_ct_log_config.c
index 86f04563e18..401dc71131f 100644
--- a/modules/ssl/ssl_ct_log_config.c
+++ b/modules/ssl/ssl_ct_log_config.c
@@ -113,7 +113,7 @@ static apr_status_t read_public_key(apr_pool_t *p, const char *pubkey_fname,
 static void digest_public_key(EVP_PKEY *pubkey, unsigned char digest[LOG_ID_SIZE])
 {
     int len = i2d_PUBKEY(pubkey, NULL);
-    unsigned char *val = malloc(len);
+    unsigned char *val = ap_malloc(len);
     unsigned char *tmp = val;
     SHA256_CTX sha256ctx;
 
diff --git a/modules/ssl/ssl_ct_sct.c b/modules/ssl/ssl_ct_sct.c
index 5eb32cc9123..dcac6a31646 100644
--- a/modules/ssl/ssl_ct_sct.c
+++ b/modules/ssl/ssl_ct_sct.c
@@ -217,7 +217,7 @@ apr_status_t sct_parse(const char *source,
                 + 2 + fields->extlen /* 16-bit length + extensions */
                 ;
             avail = orig_len;
-            mem = malloc(avail);
+            mem = ap_malloc(avail);
             orig_mem = mem;
             
             rv = ctutil_serialize_uint8(&mem, &avail, 0); /* version 1 */
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index 58298c20461..bf1740630be 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -383,7 +383,7 @@ static void __stdcall service_nt_main_fn_w(DWORD argc, LPWSTR *argv)
     apr_size_t wslen = wcslen(argv[0]) + 1;
     apr_size_t slen = wslen * 3 - 2;
 
-    service_name = malloc(slen);
+    service_name = ap_malloc(slen);
     (void)apr_conv_ucs2_to_utf8(argv[0], &wslen, service_name, &slen);
 
     /* args and service names live in the same pool */
@@ -415,7 +415,7 @@ static void __stdcall service_nt_main_fn_w(DWORD argc, LPWSTR *argv)
         DWORD i;
 
         mpm_new_argv->nalloc = mpm_new_argv->nelts + argc - 1;
-        cmb_data = malloc(mpm_new_argv->nalloc * sizeof(const char *));
+        cmb_data = ap_malloc(mpm_new_argv->nalloc * sizeof(const char *));
 
         /* mpm_new_argv remains first (of lower significance) */
         memcpy (cmb_data, mpm_new_argv->elts,
@@ -431,7 +431,7 @@ static void __stdcall service_nt_main_fn_w(DWORD argc, LPWSTR *argv)
         {
             wslen = wcslen(argv[i]) + 1;
             slen = wslen * 3 - 2;
-            service_name = malloc(slen);
+            service_name = ap_malloc(slen);
             (void)apr_conv_ucs2_to_utf8(argv[i], &wslen, *(cmb++), &slen);
         }
 
@@ -485,7 +485,7 @@ static void __stdcall service_nt_main_fn(DWORD argc, LPSTR *argv)
         char **cmb_data;
 
         mpm_new_argv->nalloc = mpm_new_argv->nelts + argc - 1;
-        cmb_data = malloc(mpm_new_argv->nalloc * sizeof(const char *));
+        cmb_data = ap_malloc(mpm_new_argv->nalloc * sizeof(const char *));
 
         /* mpm_new_argv remains first (of lower significance) */
         memcpy (cmb_data, mpm_new_argv->elts,
@@ -643,7 +643,7 @@ apr_status_t mpm_merge_service_args(apr_pool_t *p,
      * the service's default arguments (all others override them)...
      */
     args->nalloc = args->nelts + svc_args->nelts;
-    cmb_data = malloc(args->nalloc * sizeof(const char *));
+    cmb_data = ap_malloc(args->nalloc * sizeof(const char *));
 
     /* First three args (argv[0], -f, path) remain first */
     memcpy(cmb_data, args->elts, args->elt_size * fixed_args);
@@ -1090,14 +1090,14 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
 #if APR_HAS_UNICODE_FS
     IF_WIN_OS_IS_UNICODE
     {
-        LPWSTR *start_argv_w = malloc((argc + 1) * sizeof(LPCWSTR));
+        LPWSTR *start_argv_w = ap_malloc((argc + 1) * sizeof(LPCWSTR));
         int i;
 
         for (i = 0; i < argc; ++i)
         {
             apr_size_t slen = strlen(argv[i]) + 1;
             apr_size_t wslen = slen;
-            start_argv_w[i] = malloc(wslen * sizeof(WCHAR));
+            start_argv_w[i] = ap_malloc(wslen * sizeof(WCHAR));
             rv = apr_conv_utf8_to_ucs2(argv[i], &slen, start_argv_w[i], &wslen);
             if (rv != APR_SUCCESS)
                 return rv;
@@ -1116,7 +1116,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
 #if APR_HAS_ANSI_FS
     ELSE_WIN_OS_IS_ANSI
     {
-        char **start_argv = malloc((argc + 1) * sizeof(const char *));
+        char **start_argv = ap_malloc((argc + 1) * sizeof(const char *));
         memcpy(start_argv, argv, argc * sizeof(const char *));
         start_argv[argc] = NULL;
 
diff --git a/support/suexec.c b/support/suexec.c
index 2ebacb9bee1..1402f1297c9 100644
--- a/support/suexec.c
+++ b/support/suexec.c
@@ -239,7 +239,7 @@ static void clean_env(void)
 
     environ = &empty_ptr; /* VERY safe environment */
 
-    if ((cleanenv = (char **) calloc(AP_ENVBUF, sizeof(char *))) == NULL) {
+    if ((cleanenv = (char **) ap_calloc(AP_ENVBUF, sizeof(char *))) == NULL) {
         log_err("failed to malloc memory for environment\n");
         exit(123);
     }