ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Set 'specials' to match 'specials' in 'lib/dns/master.c'

Browse Source
This commit is contained in:
Mark Andrews
2019-02-28 17:00:15 +11:00
parent cc5e16e4d3
commit 7941a9554f
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dns/master.c
View File

@@ -569,6 +569,10 @@ loadctx_create(dns_masterformat_t format, isc_mem_t *mctx,
if (result != ISC_R_SUCCESS)
goto cleanup_inc;
lctx->keep_lex = false;
/*
* If specials change update dns_test_rdatafromstring()
* in lib/dns/tests/dnstest.c.
*/
memset(specials, 0, sizeof(specials));
specials[0] = 1;
specials['('] = 1;

12
lib/dns/tests/dnstest.c
View File

@@ -481,6 +481,7 @@ dns_test_rdatafromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
dns_rdatacallbacks_t callbacks;
isc_buffer_t source, target;
isc_lex_t *lex = NULL;
isc_lexspecials_t specials = { 0 };
isc_result_t result;
size_t length;
@@ -504,6 +505,17 @@ dns_test_rdatafromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
return (result);
}
/*
* Set characters which will be treated as valid multi-line RDATA
* delimiters while reading the source string. These should match
* specials from lib/dns/master.c.
*/
specials[0] = 1;
specials['('] = 1;
specials[')'] = 1;
specials['"'] = 1;
isc_lex_setspecials(lex, specials);
/*
* Point lexer at source.
*/