Commit 106572e

AirisXFelipe Zimmerle

authored and

Felipe Zimmerle

committed

The pool pointer is now available for ngx_http_modsecurity_config_cleanup

1 parent 4cde86b commit 106572eCopy full SHA for 106572e

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,8 @@ typedef struct {`
`93`	`93`	`ngx_flag_t sanity_checks_enabled;`
`94`	`94`
`95`	`95`	`Rules *rules_set;`
	`96`	`+`
	`97`	`+ void *pool;`
`96`	`98`	`} ngx_http_modsecurity_conf_t;`
`97`	`99`
`98`	`100`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -554,6 +554,7 @@ static void ngx_http_modsecurity_create_conf(ngx_conf_t cf)`
`554`	`554`	`conf->sanity_checks_enabled = NGX_CONF_UNSET;`
`555`	`555`	`conf->rules_set = msc_create_rules_set();`
`556`	`556`	`conf->modsec = NULL;`
	`557`	`+ conf->pool = cf->pool;`
`557`	`558`
`558`	`559`	`cln = ngx_pool_cleanup_add(cf->pool, 0);`
`559`	`560`	`if (cln == NULL) {`
`@@ -658,7 +659,7 @@ ngx_http_modsecurity_config_cleanup(void *data)`
`658`	`659`
`659`	`660`	`dd("deleting a loc conf -- RuleSet is: \"%p\"", t->rules_set);`
`660`	`661`
`661`		`- old_pool = ngx_http_modsecurity_pcre_malloc_init(NULL);`
	`662`	`+ old_pool = ngx_http_modsecurity_pcre_malloc_init(t->pool);`
`662`	`663`	`msc_rules_cleanup(t->rules_set);`
`663`	`664`	`msc_cleanup(t->modsec);`
`664`	`665`	`ngx_http_modsecurity_pcre_malloc_done(old_pool);`

Comments

(0)