]> git.kaiwu.me - nginx.git/commitdiff
fix segfault, introduced in r2423
authorIgor Sysoev <igor@sysoev.ru>
Wed, 24 Dec 2008 16:18:35 +0000 (16:18 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Wed, 24 Dec 2008 16:18:35 +0000 (16:18 +0000)
src/http/modules/ngx_http_fastcgi_module.c
src/http/modules/ngx_http_proxy_module.c

index 6e4d956d82170efedd0e02f4e3d946d8e534aed4..201ac2a21a8c10a165c331f9a7ade299e1d794b5 100644 (file)
@@ -512,7 +512,7 @@ ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf)
         return NGX_ERROR;
     }
 
-    if (u.addrs[0].sockaddr) {
+    if (u.addrs && u.addrs[0].sockaddr) {
         r->upstream->resolved->sockaddr = u.addrs[0].sockaddr;
         r->upstream->resolved->socklen = u.addrs[0].socklen;
         r->upstream->resolved->naddrs = 1;
index 2bf58ab68b443f5f451a362fa799c763d24a024e..e8c19bb16e2f5b4aa4759211a57e9af719f6cc8a 100644 (file)
@@ -614,7 +614,7 @@ ngx_http_proxy_eval(ngx_http_request_t *r, ngx_http_proxy_ctx_t *ctx,
         return NGX_ERROR;
     }
 
-    if (u.addrs[0].sockaddr) {
+    if (u.addrs && u.addrs[0].sockaddr) {
         r->upstream->resolved->sockaddr = u.addrs[0].sockaddr;
         r->upstream->resolved->socklen = u.addrs[0].socklen;
         r->upstream->resolved->naddrs = 1;