IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

we can free GeoIPRecord just after GeoIP_region_name_by_code(),

Browse Source 
because it returns a statically allocated string
This commit is contained in:
Igor Sysoev 2010-08-03 18:38:08 +00:00
parent a999586594
commit 541d8c698a
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http/modules/ngx_http_geoip_module.c
View File

@ -231,7 +231,6 @@ ngx_http_geoip_city_variable(ngx_http_request_t *r,
len = ngx_strlen(val); len = ngx_strlen(val);
v->data = ngx_pnalloc(r->pool, len); v->data = ngx_pnalloc(r->pool, len);
if (v->data == NULL) { if (v->data == NULL) {
GeoIPRecord_delete(gr); GeoIPRecord_delete(gr);
return NGX_ERROR; return NGX_ERROR;
@ -274,15 +273,16 @@ ngx_http_geoip_region_name_variable(ngx_http_request_t *r,
} }
val = GeoIP_region_name_by_code(gr->country_code, gr->region); val = GeoIP_region_name_by_code(gr->country_code, gr->region);
GeoIPRecord_delete(gr);
if (val == NULL) { if (val == NULL) {
goto no_value; goto not_found;
} }
len = ngx_strlen(val); len = ngx_strlen(val);
v->data = ngx_pnalloc(r->pool, len); v->data = ngx_pnalloc(r->pool, len);
if (v->data == NULL) { if (v->data == NULL) {
GeoIPRecord_delete(gr);
return NGX_ERROR; return NGX_ERROR;
} }
@ -293,14 +293,8 @@ ngx_http_geoip_region_name_variable(ngx_http_request_t *r,
v->no_cacheable = 0; v->no_cacheable = 0;
v->not_found = 0; v->not_found = 0;
GeoIPRecord_delete(gr);
return NGX_OK; return NGX_OK;
no_value:
GeoIPRecord_delete(gr);
not_found: not_found:
v->not_found = 1; v->not_found = 1;