# HG changeset patch
# User Ruslan Ermilov <ru@nginx.com>
# Date 1386069084 -14400
# Node ID b7b8e2fa7ebd205c795c8fa15e1794a65dfc386e
# Parent  b7bf4671bb7b8c455cf54fd39c0f87b7e4fbc312
Fixed null pointer dereference with $upstream_cache_last_modified.

diff -r b7bf4671bb7b -r b7b8e2fa7ebd src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c	Fri Nov 29 17:23:47 2013 +0400
+++ b/src/http/ngx_http_upstream.c	Tue Dec 03 15:11:24 2013 +0400
@@ -4555,7 +4555,8 @@
 {
     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)
     {