Changeset 50689 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Mar 5, 2014 6:39:57 AM (11 years ago)

Author:

vboxsync

Message:

NAT:bootp.c: dhcp server shouldn't crash if DNS information is empty or not full.

File:

• trunk/src/VBox/Devices/Network/slirp/bootp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/slirp/bootp.c

@@ -303 +303 @@
         FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &addr);
     }
-    else
-    {
-        if (!TAILQ_EMPTY(&pData->pDnsList))
-        {
-            de = TAILQ_LAST(&pData->pDnsList, dns_list_head);
-            q_dns_header = q;
-            FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &de->de_addr.s_addr);
-        }
+    else if (!TAILQ_EMPTY(&pData->pDnsList))
+    {
+        de = TAILQ_LAST(&pData->pDnsList, dns_list_head);
+        q_dns_header = q;
+        FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &de->de_addr.s_addr);
 
         TAILQ_FOREACH_REVERSE(de, &pData->pDnsList, dns_list_head, de_list)
@@ -319 +316 @@
         }
     }
-    if (pData->fPassDomain && !pData->fUseHostResolver)
+
+    if (   pData->fPassDomain
+        && !pData->fUseHostResolver
+        && !LIST_EMPTY(&pData->pDomainList))
     {
         LIST_FOREACH(dd, &pData->pDomainList, dd_list)