From 65b1592d0205c384cc4c0eae92501978dcb18009 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 30 Aug 2011 20:34:58 +0000 Subject: [PATCH] *) fix of r4060: start value should be tested after the "found" label; *) optimization: start value may be tested against end value only, since end value here may not be greater than content_length. --- .../modules/ngx_http_range_filter_module.c | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c index 55a37d416..3e416b302 100644 --- a/src/http/modules/ngx_http_range_filter_module.c +++ b/src/http/modules/ngx_http_range_filter_module.c @@ -295,10 +295,6 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx) end = content_length - 1; } - if (start >= content_length || start > end) { - goto skip; - } - if (end >= content_length) { end = content_length; @@ -308,18 +304,18 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx) found: - range = ngx_array_push(&ctx->ranges); - if (range == NULL) { - return NGX_ERROR; + if (start < end) { + range = ngx_array_push(&ctx->ranges); + if (range == NULL) { + return NGX_ERROR; + } + + range->start = start; + range->end = end; + + size += end - start; } - range->start = start; - range->end = end; - - size += end - start; - - skip: - if (*p++ != ',') { break; }