Make sure there's a host hanging off the lease before dereferencing it

diff --git a/dhcp.c b/dhcp.c
index 69dc857caf174861f57bdc13a1d634f97ad84518..cca056e237462e5a3a4108554ee6c8ea4294b106 100644 (file)
--- a/dhcp.c
+++ b/dhcp.c
@@ -429,7 +429,7 @@ void ack_lease (packet, lease, offer, when)
 
        /* Choose a filename; first from the host_decl, if any, then from
           the user class, then from the vendor class. */
-       if (lease -> host -> filename)
+       if (lease -> host && lease -> host -> filename)
                filename = lease -> host -> filename;
        else if (user_class && user_class -> filename)
                filename = user_class -> filename;
@@ -438,7 +438,7 @@ void ack_lease (packet, lease, offer, when)
        else filename = (char *)0;
 
        /* Choose a server name as above. */
-       if (lease -> host -> server_name)
+       if (lease -> host && lease -> host -> server_name)
                server_name = lease -> host -> server_name;
        else if (user_class && user_class -> server_name)
                server_name = user_class -> server_name;

diff --git a/server/dhcp.c b/server/dhcp.c
index 69dc857caf174861f57bdc13a1d634f97ad84518..cca056e237462e5a3a4108554ee6c8ea4294b106 100644 (file)
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -429,7 +429,7 @@ void ack_lease (packet, lease, offer, when)
 
        /* Choose a filename; first from the host_decl, if any, then from
           the user class, then from the vendor class. */
-       if (lease -> host -> filename)
+       if (lease -> host && lease -> host -> filename)
                filename = lease -> host -> filename;
        else if (user_class && user_class -> filename)
                filename = user_class -> filename;
@@ -438,7 +438,7 @@ void ack_lease (packet, lease, offer, when)
        else filename = (char *)0;
 
        /* Choose a server name as above. */
-       if (lease -> host -> server_name)
+       if (lease -> host && lease -> host -> server_name)
                server_name = lease -> host -> server_name;
        else if (user_class && user_class -> server_name)
                server_name = user_class -> server_name;