commit 789d6ab5c07cc115571f21d09846e7208c672860
author Valentin Bartenev <vbart@nginx.com> Tue May 23 20:19:39 2017 +0300
committer Valentin Bartenev <vbart@nginx.com> Tue May 23 20:19:39 2017 +0300
tree 8a97c30300bd3c0d5a5a5cb874d40f70632b72d9
parent b8e4b6a470aa2d76cd8fe33d235a96055c4a39b6

HTTP/2: fixed segfault when memory allocation failed.

If allocation of cleanup handler in the HTTP/2 header filter failed, then
a stream might be freed with a HEADERS frame left in the output queue.

Now the HEADERS frame is accounted in the queue before trying to allocate
the cleanup handler.

src/http/v2/ngx_http_v2_filter_module.c

diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index dac5046..7276531 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -619,6 +619,8 @@
 
     ngx_http_v2_queue_blocked_frame(r->stream->connection, frame);
 
+    r->stream->queued = 1;
+
     cln = ngx_http_cleanup_add(r, 0);
     if (cln == NULL) {
         return NGX_ERROR;
@@ -627,8 +629,6 @@
     cln->handler = ngx_http_v2_filter_cleanup;
     cln->data = r->stream;
 
-    r->stream->queued = 1;
-
     fc->send_chain = ngx_http_v2_send_chain;
     fc->need_last_buf = 1;