# HG changeset patch # User Valentin Bartenev # Date 1396022707 -14400 # Node ID d74889fbf06d453b7597228f49e1b65d3cf873b9 # Parent 2411d4b5be2ca690a5a00a1d8ad96ff69a00317f SPDY: fixed the DATA frame length handling in case of some errors. There are a few cases in ngx_http_spdy_state_read_data() related to error handling when ngx_http_spdy_state_skip() might be called with an inconsistent state between *pos and sc->length, that leads to violation of frame layout parsing and resuted in corruption of spdy connection. Based on a patch by Xiaochen Wang. diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c --- a/src/http/ngx_http_spdy.c +++ b/src/http/ngx_http_spdy.c @@ -1528,7 +1528,6 @@ ngx_http_spdy_state_read_data(ngx_http_s complete = 1; } else { - sc->length -= size; complete = 0; } @@ -1571,6 +1570,8 @@ ngx_http_spdy_state_read_data(ngx_http_s } } + sc->length -= size; + if (tf) { buf->start = pos; buf->pos = pos;