mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 14:55:30 +00:00
Code Issues Releases Wiki Activity

[rt30024]

Browse Source 
Move the line that zeros the packet_oro variable to
be earlier so it is properly cleared if we exit early.
This commit is contained in:
Shawn Routhier
2012-07-12 22:55:19 -07:00
parent df2c355e24
commit 355db4b687
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/dhcpv6.c
View File

@@ -1254,6 +1254,8 @@ lease_to_client(struct data_string *reply_ret,
isc_boolean_t no_resources_avail = ISC_FALSE; isc_boolean_t no_resources_avail = ISC_FALSE;
#endif #endif
memset(&packet_oro, 0, sizeof(packet_oro));
/* Locate the client. */ /* Locate the client. */
if (shared_network_from_packet6(&reply.shared, if (shared_network_from_packet6(&reply.shared,
packet) != ISC_R_SUCCESS) packet) != ISC_R_SUCCESS)
@@ -1276,7 +1278,6 @@ lease_to_client(struct data_string *reply_ret,
* Get the ORO from the packet, if any. * Get the ORO from the packet, if any.
*/ */
oc = lookup_option(&dhcpv6_universe, packet->options, D6O_ORO); oc = lookup_option(&dhcpv6_universe, packet->options, D6O_ORO);
memset(&packet_oro, 0, sizeof(packet_oro));
if (oc != NULL) { if (oc != NULL) {
if (!evaluate_option_cache(&packet_oro, packet, if (!evaluate_option_cache(&packet_oro, packet,
NULL, NULL, NULL, NULL,