Merge pull request #543 from mcnewton/v3.0.x

set ht to null so we don't double free on initialisation error
FreeRADIUS · Mar 12, 2014 · dd29f10 · dd29f10
2 parents ad75a70 + a383091
commit dd29f10
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/modules/proto_dhcp/dhcpd.c b/src/modules/proto_dhcp/dhcpd.c
@@ -494,7 +494,12 @@ static int dhcp_process(REQUEST *request)
 
 	vp = pairfind(request->reply->vps, 264, DHCP_MAGIC_VENDOR, TAG_ANY); /* DHCP-Your-IP-Address */
 	if (!vp) {
-		DEBUG("DHCP: Failed to find DHCP-Your-IP-Address for request.");
+		DEBUG("DHCP: Failed to find DHCP-Client-IP-Address or DHCP-Your-IP-Address");
+		DEBUG("      for request; not responding.");
+		/*
+		 *	There is nowhere to send the response to, so don't bother.
+		 */
+		request->reply->code = 0;
 		return -1;
 	}