mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 18:19:42 +00:00
Code Issues Releases Wiki Activity

lib/ns/client.c: Fix invalid order of DbC checks that could cause dereference before NULL check

Browse Source
This commit is contained in:
Ondřej Surý 2019-09-27 12:10:44 +02:00
parent f855f09a55
commit b4a42a286f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ns/client.c
View File

@ -1198,7 +1198,7 @@ client_send(ns_client_t *client) {
unsigned int preferred_glue;
bool opt_included = false;
size_t respsize;
dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr);
dns_aclenv_t *env;
#ifdef HAVE_DNSTAP
unsigned char zone[DNS_NAME_MAXWIRE];
dns_dtmsgtype_t dtmsgtype;
@ -1207,6 +1207,8 @@ client_send(ns_client_t *client) {
REQUIRE(NS_CLIENT_VALID(client));
env = ns_interfacemgr_getaclenv(client->interface->mgr);
CTRACE("send");
if (client->message->opcode == dns_opcode_query &&
@ -1741,12 +1743,13 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message,
unsigned int flags;
unsigned char expire[4];
unsigned char advtimo[2];
dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr);
dns_aclenv_t *env;
REQUIRE(NS_CLIENT_VALID(client));
REQUIRE(opt != NULL && *opt == NULL);
REQUIRE(message != NULL);
env = ns_interfacemgr_getaclenv(client->interface->mgr);
view = client->view;
resolver = (view != NULL) ? view->resolver : NULL;
if (resolver != NULL)
@ -3283,13 +3286,15 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
ns_client_t *client = event->ev_arg;
isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event;
dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr);
dns_aclenv_t *env;
uint32_t old;
REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN);
REQUIRE(NS_CLIENT_VALID(client));
REQUIRE(client->task == task);
env = ns_interfacemgr_getaclenv(client->interface->mgr);
UNUSED(task);
INSIST(client->state == NS_CLIENTSTATE_READY);