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

Geo: fixed access to already freed memory.

Browse Source 
Previously, in "ranges" mode when all added ranges were deleted,
the ctx.high.low[i] was left pointing to a temporary array.
This commit is contained in:
Valentin Bartenev 2016-08-18 17:11:03 +03:00
parent 50ba1a2cde
commit 535550b406
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/http/modules/ngx_http_geo_module.c
View File

@ -469,7 +469,12 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
for (i = 0; i < 0x10000; i++) {
a = (ngx_array_t *) ctx.high.low[i];
if (a == NULL || a->nelts == 0) {
if (a == NULL) {
continue;
}
if (a->nelts == 0) {
ctx.high.low[i] = NULL;
continue;
}

7
src/stream/ngx_stream_geo_module.c
View File

@ -436,7 +436,12 @@ ngx_stream_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
for (i = 0; i < 0x10000; i++) {
a = (ngx_array_t *) ctx.high.low[i];
if (a == NULL || a->nelts == 0) {
if (a == NULL) {
continue;
}
if (a->nelts == 0) {
ctx.high.low[i] = NULL;
continue;
}