]> git.kaiwu.me - nginx.git/commitdiff
fix segfault if no rules are defined, introduced in r3279
authorIgor Sysoev <igor@sysoev.ru>
Tue, 3 Nov 2009 16:04:07 +0000 (16:04 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Tue, 3 Nov 2009 16:04:07 +0000 (16:04 +0000)
src/http/modules/ngx_http_access_module.c

index 90f33ca0df858795909b319a56f47fa9332eb5fe..c1e7718c05f4106423888c901e18da004f4f62ec 100644 (file)
@@ -113,7 +113,7 @@ ngx_http_access_handler(ngx_http_request_t *r)
 
 #if (NGX_HAVE_INET6)
 
-    if (r->connection->sockaddr->sa_family == AF_INET6) {
+    if (alcf->rules6 && r->connection->sockaddr->sa_family == AF_INET6) {
         u_char               *p;
         in_addr_t             addr;
         struct sockaddr_in6  *sin6;
@@ -134,7 +134,7 @@ ngx_http_access_handler(ngx_http_request_t *r)
 
 #endif
 
-    if (r->connection->sockaddr->sa_family == AF_INET) {
+    if (alcf->rules && r->connection->sockaddr->sa_family == AF_INET) {
         sin = (struct sockaddr_in *) r->connection->sockaddr;
         return ngx_http_access_inet(r, alcf, sin->sin_addr.s_addr);
     }