mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 10:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix memory leak if GeoIP City database was used

Browse Source
This commit is contained in:
Igor Sysoev 2009-08-19 17:44:33 +00:00
parent 42e49ba1ef
commit 0f00b0a801
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,6 +181,7 @@ ngx_http_geoip_city_variable(ngx_http_request_t *r,
{
u_long addr;
char *val;
size_t len;
GeoIPRecord *gr;
struct sockaddr_in *sin;
ngx_http_geoip_conf_t *gcf;
@ -207,17 +208,32 @@ ngx_http_geoip_city_variable(ngx_http_request_t *r,
val = *(char **) ((char *) gr + data);
if (val == NULL) {
goto not_found;
goto no_value;
}
v->len = ngx_strlen(val);
len = ngx_strlen(val);
v->data = ngx_pnalloc(r->pool, len);
if (v->data == NULL) {
GeoIPRecord_delete(gr);
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;
GeoIPRecord_delete(gr);
return NGX_OK;
no_value:
GeoIPRecord_delete(gr);
not_found:
v->not_found = 1;