diff --git a/src/mod_access.c b/src/mod_access.c index 3769845b..ed299425 100644 --- a/src/mod_access.c +++ b/src/mod_access.c @@ -63,12 +63,12 @@ SETDEFAULTS_FUNC(mod_access_set_defaults) { { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } }; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->access_deny = array_init(); cv[0].destination = s->access_deny; diff --git a/src/mod_accesslog.c b/src/mod_accesslog.c index 15eaf3b4..03db95d8 100644 --- a/src/mod_accesslog.c +++ b/src/mod_accesslog.c @@ -330,6 +330,8 @@ FREE_FUNC(mod_accesslog_free) { if (!s) continue; + if (!s) continue; + if (s->access_logbuffer->used) { if (s->use_syslog) { # ifdef HAVE_SYSLOG_H diff --git a/src/mod_alias.c b/src/mod_alias.c index 4d898922..22ee8312 100644 --- a/src/mod_alias.c +++ b/src/mod_alias.c @@ -73,12 +73,12 @@ SETDEFAULTS_FUNC(mod_alias_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->alias = array_init(); cv[0].destination = s->alias; diff --git a/src/mod_auth.c b/src/mod_auth.c index 816810a4..5391f73d 100644 --- a/src/mod_auth.c +++ b/src/mod_auth.c @@ -305,7 +305,7 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) { { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } }; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { mod_auth_plugin_config *s; @@ -313,7 +313,7 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) { data_array *da; array *ca; - s = malloc(sizeof(mod_auth_plugin_config)); + s = calloc(1, sizeof(mod_auth_plugin_config)); s->auth_plain_groupfile = buffer_init(); s->auth_plain_userfile = buffer_init(); s->auth_htdigest_userfile = buffer_init(); diff --git a/src/mod_cgi.c b/src/mod_cgi.c index 8ac37578..d5a2ae20 100644 --- a/src/mod_cgi.c +++ b/src/mod_cgi.c @@ -147,12 +147,12 @@ SETDEFAULTS_FUNC(mod_fastcgi_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); assert(s); s->cgi = array_init(); diff --git a/src/mod_evhost.c b/src/mod_evhost.c index 9f4b5614..44712ede 100644 --- a/src/mod_evhost.c +++ b/src/mod_evhost.c @@ -124,7 +124,7 @@ SETDEFAULTS_FUNC(mod_evhost_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; diff --git a/src/mod_expire.c b/src/mod_expire.c index 261ed325..8cce5a68 100644 --- a/src/mod_expire.c +++ b/src/mod_expire.c @@ -215,12 +215,12 @@ SETDEFAULTS_FUNC(mod_expire_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->expire_url = array_init(); cv[0].destination = s->expire_url; diff --git a/src/mod_mysql_vhost.c b/src/mod_mysql_vhost.c index bfa1ef13..29108612 100644 --- a/src/mod_mysql_vhost.c +++ b/src/mod_mysql_vhost.c @@ -178,14 +178,14 @@ SERVER_FUNC(mod_mysql_vhost_set_defaults) { { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } }; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; buffer *sel; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->mydb = buffer_init(); s->myuser = buffer_init(); s->mypass = buffer_init(); diff --git a/src/mod_redirect.c b/src/mod_redirect.c index b2c737c7..60406315 100644 --- a/src/mod_redirect.c +++ b/src/mod_redirect.c @@ -78,7 +78,7 @@ SETDEFAULTS_FUNC(mod_redirect_set_defaults) { if (!p) return HANDLER_ERROR; /* 0 */ - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; @@ -86,7 +86,7 @@ SETDEFAULTS_FUNC(mod_redirect_set_defaults) { array *ca; data_array *da = (data_array *)du; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->redirect = pcre_keyvalue_buffer_init(); cv[0].destination = s->redirect; diff --git a/src/mod_rewrite.c b/src/mod_rewrite.c index 4395c256..915f638d 100644 --- a/src/mod_rewrite.c +++ b/src/mod_rewrite.c @@ -238,13 +238,13 @@ SETDEFAULTS_FUNC(mod_rewrite_set_defaults) { if (!p) return HANDLER_ERROR; /* 0 */ - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; array *ca; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->rewrite = rewrite_rule_buffer_init(); cv[0].destination = s->rewrite; diff --git a/src/mod_rrdtool.c b/src/mod_rrdtool.c index 0807844d..fd0d1071 100644 --- a/src/mod_rrdtool.c +++ b/src/mod_rrdtool.c @@ -301,12 +301,12 @@ SETDEFAULTS_FUNC(mod_rrd_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->path_rrdtool_bin = buffer_init(); s->path_rrd = buffer_init(); s->requests = 0; diff --git a/src/mod_secure_download.c b/src/mod_secure_download.c index 098fa590..166cc65f 100644 --- a/src/mod_secure_download.c +++ b/src/mod_secure_download.c @@ -106,12 +106,12 @@ SETDEFAULTS_FUNC(mod_secdownload_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->secret = buffer_init(); s->doc_root = buffer_init(); s->uri_prefix = buffer_init(); diff --git a/src/mod_setenv.c b/src/mod_setenv.c index ca97a38b..f2b3c9ed 100644 --- a/src/mod_setenv.c +++ b/src/mod_setenv.c @@ -79,12 +79,12 @@ SETDEFAULTS_FUNC(mod_setenv_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->request_header = array_init(); s->response_header = array_init(); s->environment = array_init(); diff --git a/src/mod_simple_vhost.c b/src/mod_simple_vhost.c index e3f1c01c..9d8e7fc7 100644 --- a/src/mod_simple_vhost.c +++ b/src/mod_simple_vhost.c @@ -89,7 +89,7 @@ SETDEFAULTS_FUNC(mod_simple_vhost_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; diff --git a/src/mod_skeleton.c b/src/mod_skeleton.c index ca882ef4..7a1dddbe 100644 --- a/src/mod_skeleton.c +++ b/src/mod_skeleton.c @@ -107,12 +107,12 @@ SETDEFAULTS_FUNC(mod_skeleton_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->match = array_init(); cv[0].destination = s->match; diff --git a/src/mod_ssi.c b/src/mod_ssi.c index d4d3fe5f..e9312e4e 100644 --- a/src/mod_ssi.c +++ b/src/mod_ssi.c @@ -94,12 +94,12 @@ SETDEFAULTS_FUNC(mod_ssi_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->ssi_extension = array_init(); cv[0].destination = s->ssi_extension; diff --git a/src/mod_status.c b/src/mod_status.c index e773b315..5ac4533c 100644 --- a/src/mod_status.c +++ b/src/mod_status.c @@ -110,12 +110,12 @@ SETDEFAULTS_FUNC(mod_status_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->config_url = buffer_init(); s->status_url = buffer_init(); s->sort = 1; diff --git a/src/mod_userdir.c b/src/mod_userdir.c index b0cf6990..283159c7 100644 --- a/src/mod_userdir.c +++ b/src/mod_userdir.c @@ -88,12 +88,12 @@ SETDEFAULTS_FUNC(mod_userdir_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->exclude_user = array_init(); s->include_user = array_init(); s->path = buffer_init(); diff --git a/src/mod_usertrack.c b/src/mod_usertrack.c index ec1d1bc0..88ab09ac 100644 --- a/src/mod_usertrack.c +++ b/src/mod_usertrack.c @@ -83,12 +83,12 @@ SETDEFAULTS_FUNC(mod_usertrack_set_defaults) { if (!p) return HANDLER_ERROR; - p->config_storage = malloc(srv->config_context->used * sizeof(specific_config *)); + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; - s = malloc(sizeof(plugin_config)); + s = calloc(1, sizeof(plugin_config)); s->cookie_name = buffer_init(); s->cookie_domain = buffer_init(); s->cookie_max_age = 0;