Fix crash in DHCPINFORM without valid --dhcp-range.

This commit is contained in:
Simon Kelley committed 2012-03-23 10:00:02 +00:00
1 parent 52d4abf2f9
commit 7d2b5c9583
2 files changed
+6 -1

No files matched your search

+4
View File
@@ -51,6 +51,10 @@ version 2.61
the lo interface. Thanks to Mathieu Trudel-Lapierre for
the idea and initial patch.
Fix crash, introduced in 2.60, when a DHCPINFORM is
received from a network which has no valid dhcp-range.
Thanks to Stephane Glondu for the bug report.
version 2.60
Fix compilation problem in Mac OS X Lion. Thanks to Olaf
+2 -1
View File
@@ -2095,7 +2095,8 @@ static void do_options(struct dhcp_context *context,
struct dhcp_netid_list *id_list;
/* filter options based on tags, those we want get DHOPT_TAGOK bit set */
context->netid.next = NULL;
if (context)
context->netid.next = NULL;
tagif = option_filter(netid, context && context->netid.net ? &context->netid : NULL, config_opts);
/* logging */