Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash caused by looking up servers.bind when many servers defined.

Browse Source
This commit is contained in:
Simon Kelley
2015-04-06 17:19:13 +01:00
parent 982faf4024
commit 04b0ac0537
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@@ -75,7 +75,12 @@ version 2.73
Add --tftp-no-fail option. Thanks to Stefan Tomanek for Add --tftp-no-fail option. Thanks to Stefan Tomanek for
the patch. the patch.
Fix crash caused by looking up servers.bind, CHAOS text record,
when more than about five --servers= lines are in the dnsmasq
config. This causes memory corruption which causes a crash later.
Thanks to Matt Coddington for sterling work chasing this down.
version 2.72 version 2.72
Add ra-advrouter mode, for RFC-3775 mobile IPv6 support. Add ra-advrouter mode, for RFC-3775 mobile IPv6 support.

4
src/cache.c
View File

@@ -1367,7 +1367,7 @@ int cache_make_stat(struct txt_record *t)
} }
port = prettyprint_addr(&serv->addr, daemon->addrbuff); port = prettyprint_addr(&serv->addr, daemon->addrbuff);
lenp = p++; /* length */ lenp = p++; /* length */
bytes_avail = (p - buff) + bufflen; bytes_avail = bufflen - (p - buff );
bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries); bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries);
if (bytes_needed >= bytes_avail) if (bytes_needed >= bytes_avail)
{ {
@@ -1381,7 +1381,7 @@ int cache_make_stat(struct txt_record *t)
lenp = p - 1; lenp = p - 1;
buff = new; buff = new;
bufflen = newlen; bufflen = newlen;
bytes_avail = (p - buff) + bufflen; bytes_avail = bufflen - (p - buff );
bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries); bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries);
} }
*lenp = bytes_needed; *lenp = bytes_needed;