ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Don't use query->sendevent after it's been destroyed (#39132)

Browse Source
This commit is contained in:
Mukund Sivaraman
2015-04-13 15:03:12 +05:30
parent 54fe1d05b6
commit 2c4d5faf7f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
4096. [bug] Fix a use after free of query->sendevent.
[RT #39132]
4095. [bug] zone->options2 was not being properly initalized.
[RT #39228]

6
lib/dns/resolver.c
View File

@@ -1276,6 +1276,7 @@ fctx_done(fetchctx_t *fctx, isc_result_t result, int line) {
static void
process_sendevent(resquery_t *query, isc_event_t *event) {
isc_socketevent_t *sevent = (isc_socketevent_t *)event;
isc_boolean_t destroy_query = ISC_FALSE;
isc_boolean_t retry = ISC_FALSE;
isc_result_t result;
fetchctx_t *fctx;
@@ -1290,7 +1291,7 @@ process_sendevent(resquery_t *query, isc_event_t *event) {
*/
if (query->tcpsocket != NULL)
isc_socket_detach(&query->tcpsocket);
resquery_destroy(&query);
destroy_query = ISC_TRUE;
}
} else {
switch (sevent->result) {
@@ -1340,6 +1341,9 @@ process_sendevent(resquery_t *query, isc_event_t *event) {
else
fctx_try(fctx, ISC_TRUE, ISC_FALSE);
}
if (destroy_query)
resquery_destroy(&query);
}
static void