From: Maxim Dounin <mdounin@mdounin.ru>
Date: Wed, 19 Mar 2014 08:57:39 +0000 (+0400)
Subject: SPDY: improved ngx_http_spdy_state_save() check.
X-Git-Tag: release-1.5.13~30
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=062e7a00426e14a116446b71c1418f29796e672b;p=nginx.git

SPDY: improved ngx_http_spdy_state_save() check.
---

diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c
index 6e45f4b46..24772bd2e 100644
--- a/src/http/ngx_http_spdy.c
+++ b/src/http/ngx_http_spdy.c
@@ -1872,14 +1872,16 @@ static u_char *
 ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc,
     u_char *pos, u_char *end, ngx_http_spdy_handler_pt handler)
 {
-#if 1
-    if (end - pos > NGX_SPDY_STATE_BUFFER_SIZE) {
+    size_t  size;
+
+    size = end - pos;
+
+    if (size > NGX_SPDY_STATE_BUFFER_SIZE) {
         ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0,
                       "spdy state buffer overflow: "
                       "%z bytes required", end - pos);
         return ngx_http_spdy_state_internal_error(sc);
     }
-#endif
 
     ngx_memcpy(sc->buffer, pos, NGX_SPDY_STATE_BUFFER_SIZE);