# HG changeset patch # User Ruslan Ermilov # Date 1386069084 -14400 # Node ID b7b8e2fa7ebd205c795c8fa15e1794a65dfc386e # Parent b7bf4671bb7b8c455cf54fd39c0f87b7e4fbc312 Fixed null pointer dereference with $upstream_cache_last_modified. 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 @@ -4555,7 +4555,8 @@ ngx_http_upstream_cache_last_modified(ng { u_char *p; - if (!r->upstream->conf->cache_revalidate + if (r->upstream == NULL + || !r->upstream->conf->cache_revalidate || r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED || r->cache->last_modified == -1) {