You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gb...@apache.org on 2020/02/18 07:37:46 UTC
svn commit: r1874156 - in /httpd/httpd/trunk:
modules/filters/mod_proxy_html.c modules/ssl/ssl_ct_log_config.c
modules/ssl/ssl_ct_sct.c server/mpm/winnt/service.c support/suexec.c
Author: gbechis
Date: Tue Feb 18 07:37:45 2020
New Revision: 1874156
URL: http://svn.apache.org/viewvc?rev=1874156&view=rev
Log:
convert malloc(3) into ap_malloc
bz 64049
Modified:
httpd/httpd/trunk/modules/filters/mod_proxy_html.c
httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c
httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c
httpd/httpd/trunk/server/mpm/winnt/service.c
httpd/httpd/trunk/support/suexec.c
Modified: httpd/httpd/trunk/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_proxy_html.c?rev=1874156&r1=1874155&r2=1874156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_proxy_html.c Tue Feb 18 07:37:45 2020
@@ -203,7 +203,7 @@ static void preserve(saxctxt *ctx, const
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,
Modified: httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c?rev=1874156&r1=1874155&r2=1874156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c Tue Feb 18 07:37:45 2020
@@ -113,7 +113,7 @@ static apr_status_t read_public_key(apr_
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;
Modified: httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c?rev=1874156&r1=1874155&r2=1874156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c Tue Feb 18 07:37:45 2020
@@ -217,7 +217,7 @@ apr_status_t sct_parse(const char *sourc
+ 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 */
Modified: httpd/httpd/trunk/server/mpm/winnt/service.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/service.c?rev=1874156&r1=1874155&r2=1874156&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/service.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/service.c Tue Feb 18 07:37:45 2020
@@ -383,7 +383,7 @@ static void __stdcall service_nt_main_fn
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
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
{
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
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_
* 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_
#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_
#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;
Modified: httpd/httpd/trunk/support/suexec.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/suexec.c?rev=1874156&r1=1874155&r2=1874156&view=diff
==============================================================================
--- httpd/httpd/trunk/support/suexec.c (original)
+++ httpd/httpd/trunk/support/suexec.c Tue Feb 18 07:37:45 2020
@@ -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);
}