mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-04 16:25:21 +00:00
Code Issues Releases Wiki Activity

[master] Fixes minor coverity issues

Browse Source 
Merges in rt46836
This commit is contained in:
Thomas Markwalder
2017-12-18 13:50:03 -05:00
parent 1e80a731f0
commit e8b058cfa5
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RELNOTES
View File

@@ -273,6 +273,9 @@ dhcp-users@lists.isc.org.
default). You must compile with one or the other but not both. default). You must compile with one or the other but not both.
[ISC-Bugs #42446] [ISC-Bugs #42446]
- Corrected some minor coverity issues: CID 1426059, 1426058, and 1426057.
[ISC-Bugs #46836]
Changes since 4.3.6 (Bugs): Changes since 4.3.6 (Bugs):
- Corrected an issue where the server would return a client's previously - Corrected an issue where the server would return a client's previously

9
client/dhc6.c
View File

@@ -5141,12 +5141,9 @@ do_decline6(void *input)
decline_done: decline_done:
/* We here because we've exhausted our retry limits or /* We here because we've exhausted our retry limits or
* something else has gone wrong with the decline process. * something else has gone wrong with the decline process.
* So let's just toss the existing lease and start over. * So let's just toss the existing lease and start over. */
*/ dhc6_lease_destroy(&client->active_lease, MDL);
if (client->active_lease != NULL) { client->active_lease = NULL;
dhc6_lease_destroy(&client->active_lease, MDL);
client->active_lease = NULL;
}
start_init6(client); start_init6(client);
return; return;

6
server/ddns.c
View File

@@ -1577,7 +1577,7 @@ ddns_fwd_srv_add3(dhcp_ddns_cb_t *ddns_cb,
{ {
isc_result_t result; isc_result_t result;
const char *logstr = NULL; const char *logstr = NULL;
char ddns_address[MAX_ADDRESS_STRING_LEN]; char ddns_address[MAX_ADDRESS_STRING_LEN+1];
#if defined (DEBUG_DNS_UPDATES) #if defined (DEBUG_DNS_UPDATES)
log_info ("DDNS: ddns_fwd_srv_add3: %s eresult: %d", log_info ("DDNS: ddns_fwd_srv_add3: %s eresult: %d",
@@ -1585,7 +1585,9 @@ ddns_fwd_srv_add3(dhcp_ddns_cb_t *ddns_cb,
#endif #endif
/* Construct a printable form of the address for logging */ /* Construct a printable form of the address for logging */
strcpy(ddns_address, piaddr(ddns_cb->address)); memset(ddns_address, 0x0, sizeof(ddns_address));
strncpy(ddns_address, piaddr(ddns_cb->address),
sizeof(ddns_address) - 1);
switch(eresult) { switch(eresult) {
case ISC_R_SUCCESS: case ISC_R_SUCCESS:

2
server/dhcpv6.c
View File

@@ -3295,7 +3295,7 @@ void shorten_lifetimes(struct reply_state *reply, struct iasubopt *lease,
/* If address matches (and for PDs the prefix len matches) /* If address matches (and for PDs the prefix len matches)
* we assume this is our subopt, so update the lifetimes */ * we assume this is our subopt, so update the lifetimes */
if (!memcmp(oc->data.data + addr_offset, &lease->addr, 16) && if (!memcmp(oc->data.data + addr_offset, &lease->addr, 16) &&
(subopt_type != D6O_IA_PD || (subopt_type != D6O_IAPREFIX ||
(oc->data.data[IASUBOPT_PD_PREFLEN_OFFSET] == (oc->data.data[IASUBOPT_PD_PREFLEN_OFFSET] ==
lease->plen))) { lease->plen))) {
u_int32_t pref_life = getULong(oc->data.data + u_int32_t pref_life = getULong(oc->data.data +