From 7fe8f72364fbac68cd82abf8fc775cce965a4a1e Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Thu, 25 Jan 2018 10:31:22 +0300 Subject: [PATCH] HTTP parser: simplified nxt_http_parse_field_value(). There's no need in loop after 4ac474b68658. Found by Coverity (CID 259713). --- src/nxt_http_parse.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/nxt_http_parse.c b/src/nxt_http_parse.c index 7393e19e..65de0d60 100644 --- a/src/nxt_http_parse.c +++ b/src/nxt_http_parse.c @@ -629,27 +629,23 @@ nxt_http_parse_field_value(nxt_http_request_parse_t *rp, u_char **pos, p += rp->field_value.length; - for ( ;; ) { - p = nxt_http_lookup_field_end(p, end); + p = nxt_http_lookup_field_end(p, end); - if (nxt_slow_path(p == end)) { - len = p - *pos; + if (nxt_slow_path(p == end)) { + len = p - *pos; - if (nxt_slow_path(len > NXT_HTTP_MAX_FIELD_VALUE)) { - return NXT_HTTP_PARSE_TOO_LARGE_FIELD; - } - - rp->field_value.length = len; - rp->handler = &nxt_http_parse_field_value; - return NXT_AGAIN; + if (nxt_slow_path(len > NXT_HTTP_MAX_FIELD_VALUE)) { + return NXT_HTTP_PARSE_TOO_LARGE_FIELD; } - ch = *p; + rp->field_value.length = len; + rp->handler = &nxt_http_parse_field_value; + return NXT_AGAIN; + } - if (nxt_fast_path(ch == '\r' || ch == '\n')) { - break; - } + ch = *p; + if (nxt_slow_path(ch != '\r' && ch != '\n')) { return NXT_HTTP_PARSE_INVALID; }