projects / dnsmasq.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2362784)
Fix crash in PXE code with bad config.
authorSimon Kelley <simon@thekelleys.org.uk>
Tue, 18 Jan 2022 00:55:13 +0000 (00:55 +0000)
committerSimon Kelley <simon@thekelleys.org.uk>
Tue, 18 Jan 2022 00:55:13 +0000 (00:55 +0000)
debian/changelog patch | blob | history
src/rfc2131.c patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 2d823ad..837dacd 100644 (file)
--- 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
index c902eb7..a99bb89 100644 (file)
--- 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;
 }
Dnsmasq DNS proxy and DHCP server.