# HG changeset patch # User Igor Sysoev # Date 1232983070 0 # Node ID afba93b8bf06aa426b1557eab36840f97a8dfaae # Parent d7d3a72c07d872c4d8a43eb085d8912615c2304e r2414 merge: fix segfault diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -2345,7 +2345,9 @@ ngx_http_upstream_finalize_request(ngx_h 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();