nginx: src/http/modules/ngx_http_geoip

Fixed memory leak if $geoip_org variable was used. Patch by Denis F. Latypoff (slightly modified).

comparison

equal deleted inserted replaced

-:959371df1806
+:a321eadcb16c
 ngx_http_variable_value_t *v, uintptr_t data)
 {
 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;
 gcf = ngx_http_get_module_main_conf(r, ngx_http_geoip_module);
 if (val == NULL) {
 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;
 not_found:

Mercurial > hg > nginx