[4097a] Added a no subnet check in buildCfgOptionList()

d40a3b41 · Francis Dupont · 95fd3715 · d40a3b41
Commit d40a3b41 authored Nov 25, 2015 by Francis Dupont
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

src/bin/dhcp4/dhcp4_srv.cc src/bin/dhcp4/dhcp4_srv.cc +6 -1

No files found.
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -827,7 +827,12 @@ Dhcpv4Srv::buildCfgOptionList(Dhcpv4Exchange& ex) {

    // First subnet configured options
    Subnet4Ptr subnet = ex.getContext()->subnet_;
-    if (subnet && !subnet->getCfgOption()->empty()) {
+    if (!subnet) {
+        // All methods using the CfgOptionList object return soon when
+        // there is no subnet so do the same
+        return;
+    }
+    if (!subnet->getCfgOption()->empty()) {
        co_list.push_back(subnet->getCfgOption());
    }