Mercurial > hg > nginx
changeset 6661:ec141a44641b
Geo: fixed overflow when iterating over ranges.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Tue, 23 Aug 2016 15:57:29 +0300 |
parents | 3eb1a92a2f05 |
children | 1301a58b5dac |
files | src/http/modules/ngx_http_geo_module.c src/stream/ngx_stream_geo_module.c |
diffstat | 2 files changed, 20 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -946,7 +946,9 @@ ngx_http_geo_add_range(ngx_conf_t *cf, n next: - continue; + if (h == 0xffff) { + break; + } } return NGX_CONF_OK; @@ -985,7 +987,7 @@ ngx_http_geo_delete_range(ngx_conf_t *cf if (a == NULL) { warn = 1; - continue; + goto next; } range = a->elts; @@ -1010,6 +1012,12 @@ ngx_http_geo_delete_range(ngx_conf_t *cf warn = 1; } + + next: + + if (h == 0xffff) { + break; + } } return warn;
--- a/src/stream/ngx_stream_geo_module.c +++ b/src/stream/ngx_stream_geo_module.c @@ -896,7 +896,9 @@ ngx_stream_geo_add_range(ngx_conf_t *cf, next: - continue; + if (h == 0xffff) { + break; + } } return NGX_CONF_OK; @@ -935,7 +937,7 @@ ngx_stream_geo_delete_range(ngx_conf_t * if (a == NULL) { warn = 1; - continue; + goto next; } range = a->elts; @@ -960,6 +962,12 @@ ngx_stream_geo_delete_range(ngx_conf_t * warn = 1; } + + next: + + if (h == 0xffff) { + break; + } } return warn;