upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 05:59:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4353-fix-nibbles-9.18' into 'bind-9.18'

Browse source 
[9.18] Address infinite loop when processing $GENERATE

See merge request isc-projects/bind9!9017
This commit is contained in:
Mark Andrews 2024-05-07 00:40:13 +00:00
commit 0b740dfee6
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
6383. [bug] Address an infinite loop in $GENERATE when a negative
value was converted in nibble mode. [GL #4353]
6382. [bug] Fix RPZ response's SOA record TTL, which was incorrectly
set to 1 if 'add-soa' is used. [GL #3323]

1
bin/tests/system/checkzone/zones/good-generate-modifier.db
View file

@ -18,3 +18,4 @@ $GENERATE 0-7 host$ A 1.2.3.${1,0,d}
$GENERATE 8-9 host$ A 1.2.3.${1,0}
$GENERATE 10-11 host$ A 1.2.3.${1}
$GENERATE 1024-1026 ${0,3,n} AAAA 2001:db8::${0,4,x}
$GENERATE 1024-1026 ${-2000,0,n} AAAA 2001:db8::${0,4,x}

3
lib/dns/master.c
View file

@ -626,7 +626,8 @@ static const char *hex = "0123456789abcdef0123456789ABCDEF";
* counting the terminating NUL.
*/
static unsigned int
nibbles(char *numbuf, size_t length, unsigned int width, char mode, int value) {
nibbles(char *numbuf, size_t length, unsigned int width, char mode,
unsigned int value) {
unsigned int count = 0;
/*