From 9fbd0d7c1dec054fd8c8ef104ad26bccde853289 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Mon, 28 May 2012 13:17:48 +0000 Subject: [PATCH] Fixed memory leak if $geoip_org variable was used. Patch by Denis F. Latypoff (slightly modified). --- src/http/modules/ngx_http_geoip_module.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/http/modules/ngx_http_geoip_module.c b/src/http/modules/ngx_http_geoip_module.c index abc79cdfe..8da18e957 100644 --- a/src/http/modules/ngx_http_geoip_module.c +++ b/src/http/modules/ngx_http_geoip_module.c @@ -291,6 +291,7 @@ ngx_http_geoip_org_variable(ngx_http_request_t *r, ngx_http_geoip_variable_handler_pt handler = (ngx_http_geoip_variable_handler_pt) data; + size_t len; const char *val; ngx_http_geoip_conf_t *gcf; @@ -306,11 +307,21 @@ ngx_http_geoip_org_variable(ngx_http_request_t *r, goto not_found; } - v->len = ngx_strlen(val); + len = ngx_strlen(val); + v->data = ngx_pnalloc(r->pool, len); + if (v->data == NULL) { + ngx_free(val); + return NGX_ERROR; + } + + ngx_memcpy(v->data, val, len); + + v->len = len; v->valid = 1; v->no_cacheable = 0; v->not_found = 0; - v->data = (u_char *) val; + + ngx_free(val); return NGX_OK;