github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 11:16:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Flip allocations that happen during initialization (typically) over to use non-global apr memory pools.

Browse Source
This commit is contained in:
David Andrews
2013-12-16 14:53:19 -08:00
committed by Felipe Zimmerle
parent 31d7fc6d38
commit 27dd513ab6
5 changed files with 130 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
standalone/api.c
View File

@@ -266,7 +266,7 @@ const char *modsecProcessConfig(directory_config *config, const char *file, cons
incpath = file;
/* locate the start of the directories proper */
status = apr_filepath_root(&rootpath, &incpath, APR_FILEPATH_TRUENAME | APR_FILEPATH_NATIVE, pool);
status = apr_filepath_root(&rootpath, &incpath, APR_FILEPATH_TRUENAME | APR_FILEPATH_NATIVE, config->mp);
/* we allow APR_SUCCESS and APR_EINCOMPLETE */
if (APR_ERELATIVE == status) {
@@ -274,20 +274,20 @@ const char *modsecProcessConfig(directory_config *config, const char *file, cons
if(dir[li] != '/' && dir[li] != '\\')
#ifdef WIN32
file = apr_pstrcat(pool, dir, "\\", file, NULL);
file = apr_pstrcat(config->mp, dir, "\\", file, NULL);
#else
file = apr_pstrcat(pool, dir, "/", file, NULL);
file = apr_pstrcat(config->mp, dir, "/", file, NULL);
#endif
else
file = apr_pstrcat(pool, dir, file, NULL);
file = apr_pstrcat(config->mp, dir, file, NULL);
}
else if (APR_EBADPATH == status) {
return apr_pstrcat(pool, "Config file has a bad path, ", file, NULL);
return apr_pstrcat(config->mp, "Config file has a bad path, ", file, NULL);
}
apr_pool_create(&ptemp, pool);
apr_pool_create(&ptemp, config->mp);
err = process_command_config(server, config, pool, ptemp, file);
err = process_command_config(server, config, config->mp, ptemp, file);
apr_pool_destroy(ptemp);