| commit | 04199332832568384202111ae0e75d90b69b0d01 | [log] [tgz] |
|---|---|---|
| author | Ruslan Ermilov <ru@nginx.com> | Tue Dec 03 15:11:24 2013 +0400 |
| committer | Ruslan Ermilov <ru@nginx.com> | Tue Dec 03 15:11:24 2013 +0400 |
| tree | 188944f6d6682bad93cc0592134eec6b411f09d1 | |
| parent | bfda85b6e48a8936b288e5f95834b00fb2bc510c [diff] |
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 index 9570ccc..c148f38 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c
@@ -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) {