Merge pull request yaoweibin#48 from dmitry-saprykin/reload-segfault-fix

yaoweibin · yaoweibin · commit fdda58751149 · 2014-12-05T10:28:52.000-08:00
* serfault on reload fix
diff --git a/ngx_http_upstream_check_module.c b/ngx_http_upstream_check_module.c
@@ -3991,9 +3991,9 @@ ngx_http_upstream_check_find_shm_peer(ngx_http_upstream_check_peers_shm_t *p,
             continue;
         }
 
-        if ((ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 0)
-            && (ngx_strncmp(upstream_name->data, peer_shm->upstream_name->data,
-                            upstream_name->len) == 0)) {
+        if (ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 0
+            && upstream_name->len == peer_shm->upstream_name->len
+            && ngx_strncmp(upstream_name->data, peer_shm->upstream_name->data, upstream_name->len) == 0) {
             return peer_shm;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -3991,9 +3991,9 @@ ngx_http_upstream_check_find_shm_peer(ngx_http_upstream_check_peers_shm_t *p,`
`3991`	`3991`	`continue;`
`3992`	`3992`	`}`
`3993`	`3993`
`3994`		`- if ((ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 0)`
`3995`		`- && (ngx_strncmp(upstream_name->data, peer_shm->upstream_name->data,`
`3996`		`- upstream_name->len) == 0)) {`
	`3994`	`+ if (ngx_memcmp(addr->sockaddr, peer_shm->sockaddr, addr->socklen) == 0`
	`3995`	`+ && upstream_name->len == peer_shm->upstream_name->len`
	`3996`	`+ && ngx_strncmp(upstream_name->data, peer_shm->upstream_name->data, upstream_name->len) == 0) {`
`3997`	`3997`	`return peer_shm;`
`3998`	`3998`	`}`
`3999`	`3999`	`}`