[nginx] SPDY: fixed one case of improper memory allocation error...

Valentin Bartenev vbart at nginx.com
Thu May 15 15:25:42 UTC 2014


details:   http://hg.nginx.org/nginx/rev/5cf537731218
branches:  
changeset: 5686:5cf537731218
user:      Valentin Bartenev <vbart at nginx.com>
date:      Wed Apr 30 02:16:21 2014 +0400
description:
SPDY: fixed one case of improper memory allocation error handling.

Now ngx_http_spdy_construct_request_line() doesn't try to finalize request
in case of failed memory allocation.

diffstat:

 src/http/ngx_http_spdy.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 0cbefdcf82a6 -r 5cf537731218 src/http/ngx_http_spdy.c
--- a/src/http/ngx_http_spdy.c	Wed May 14 22:26:30 2014 +0400
+++ b/src/http/ngx_http_spdy.c	Wed Apr 30 02:16:21 2014 +0400
@@ -2900,7 +2900,8 @@ ngx_http_spdy_construct_request_line(ngx
 
     p = ngx_pnalloc(r->pool, r->request_line.len + 1);
     if (p == NULL) {
-        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        ngx_http_spdy_close_stream(r->spdy_stream,
+                                   NGX_HTTP_INTERNAL_SERVER_ERROR);
         return NGX_ERROR;
     }
 



More information about the nginx-devel mailing list