From: Valentin Bartenev <vbart@nginx.com>
Date: Wed, 9 Apr 2014 14:15:32 +0000 (+0400)
Subject: SPDY: moved a variable initialization near to its check.
X-Git-Tag: release-1.6.0~6
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=7da40e6a99fb247d5d97af25cae0c50ed5e55629;p=nginx.git

SPDY: moved a variable initialization near to its check.

This should prevent attempts of using pointer before it was checked, since
all modern compilers are able to spot access to uninitialized variable.

No functional changes.
---

diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c
index 4f3ea1edc..b935b6fdd 100644
--- a/src/http/ngx_http_spdy.c
+++ b/src/http/ngx_http_spdy.c
@@ -1412,8 +1412,6 @@ ngx_http_spdy_state_data(ngx_http_spdy_connection_t *sc, u_char *pos,
 {
     ngx_http_spdy_stream_t  *stream;
 
-    stream = sc->stream;
-
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
                    "spdy DATA frame");
 
@@ -1441,6 +1439,8 @@ ngx_http_spdy_state_data(ngx_http_spdy_connection_t *sc, u_char *pos,
         sc->recv_window = NGX_SPDY_MAX_WINDOW;
     }
 
+    stream = sc->stream;
+
     if (stream == NULL) {
         return ngx_http_spdy_state_skip(sc, pos, end);
     }