IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-19 05:33:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

HTTP/2: fixed segfault when memory allocation failed.

Browse Source 
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.
This commit is contained in:
Valentin Bartenev 2017-05-23 20:19:39 +03:00
parent bfe36ba318
commit cce3934461
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/v2/ngx_http_v2_filter_module.c
View File

@ -619,6 +619,8 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
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 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
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;