From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 26 Jan 2009 15:17:50 +0000 (+0000)
Subject: r2414 merge:
X-Git-Tag: release-0.6.35~4
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=27947f38ef109b38f0c5530582536546cb074a8d;p=nginx.git

r2414 merge:

fix segfault
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 3f77c03c4..bb235db8a 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2345,7 +2345,9 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "finalize http upstream request: %i", rc);
 
-    *u->cleanup = NULL;
+    if (u->cleanup) {
+        *u->cleanup = NULL;
+    }
 
     if (u->state && u->state->response_sec) {
         tp = ngx_timeofday();