mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-03 04:39:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crash in ngx_resolver_cleanup_tree().

Browse Source 
If sending a DNS request fails with an error (e.g., when mistakenly trying
to send it to a local IP broadcast), such a request is not deleted if there
are clients waiting on it.  However, it was still erroneously removed from
the queue.  Later ngx_resolver_cleanup_tree() attempted to remove it from
the queue again that resulted in a NULL pointer dereference.
This commit is contained in:
Ruslan Ermilov 2012-06-18 12:30:45 +00:00
parent b9feaa8dd9
commit da8bb22634
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/ngx_resolver.c
View File

@ -977,12 +977,11 @@ ngx_resolver_resend(ngx_resolver_t *r, ngx_rbtree_t *tree, ngx_queue_t *queue)
if (rn->waiting) {
if (ngx_resolver_send_query(r, rn) == NGX_OK) {
(void) ngx_resolver_send_query(r, rn);
rn->expire = now + r->resend_timeout;
rn->expire = now + r->resend_timeout;
ngx_queue_insert_head(queue, &rn->queue);
}
ngx_queue_insert_head(queue, q);
continue;
}