mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-29 01:09:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Geo: fixed overflow when iterating over ranges.

Browse Source
This commit is contained in:
Ruslan Ermilov 2016-08-23 15:57:29 +03:00
parent 218c8d493f
commit 36e1c887db
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -946,7 +946,9 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
next: next:
continue; if (h == 0xffff) {
break;
}
} }
return NGX_CONF_OK; return NGX_CONF_OK;
@ -985,7 +987,7 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
if (a == NULL) { if (a == NULL) {
warn = 1; warn = 1;
continue; goto next;
} }
range = a->elts; range = a->elts;
@ -1010,6 +1012,12 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
warn = 1; warn = 1;
} }
next:
if (h == 0xffff) {
break;
}
} }
return warn; return warn;

12
src/stream/ngx_stream_geo_module.c
View File

@ -896,7 +896,9 @@ ngx_stream_geo_add_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
next: next:
continue; if (h == 0xffff) {
break;
}
} }
return NGX_CONF_OK; return NGX_CONF_OK;
@ -935,7 +937,7 @@ ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
if (a == NULL) { if (a == NULL) {
warn = 1; warn = 1;
continue; goto next;
} }
range = a->elts; range = a->elts;
@ -960,6 +962,12 @@ ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
warn = 1; warn = 1;
} }
next:
if (h == 0xffff) {
break;
}
} }
return warn; return warn;