Fix crash in PXE code with bad config.

imp · Jan 18, 2022 · 4e2a4b8 · 4e2a4b8
1 parent 2362784
commit 4e2a4b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
 dnsmasq (2.87-1) unstable; urgency=low
 
-   * New upstream. (closes: #1001209)
+   * New upstream. (closes: #1001209, #1003156)
    * Include new NFTset support in the build.
    * Fix crash on netboot with DNS server disabled. (closes: #996332)
    * Fix rare lockup in DNSSEC. (closes: #1001576)

diff --git a/src/rfc2131.c b/src/rfc2131.c
@@ -2200,8 +2200,9 @@ static int pxe_uefi_workaround(int pxe_arch, struct dhcp_netid *netid, struct dh
       inet_ntop(AF_INET, &mess->siaddr, (char *)mess->sname, INET_ADDRSTRLEN);
     }
 
-  snprintf((char *)mess->file, sizeof(mess->file), 
-	   strchr(found->basename, '.') ? "%s" : "%s.0", found->basename);
+  if (found->basename)
+    snprintf((char *)mess->file, sizeof(mess->file), 
+	     strchr(found->basename, '.') ? "%s" : "%s.0", found->basename);
 
   return 1;
 }