Skip to content

Fix quoted scan of escaped content #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 19, 2024
Merged

Fix quoted scan of escaped content #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18e8c84
Fix scan in fallback parser of quoted segment that starts is_escaped.
wcawijngaards Jun 18, 2024
4606c49
Add test for quoted scan in fallback parser that starts is_escaped.
wcawijngaards Jun 18, 2024
af6e146
- Pad test cases.
wcawijngaards Jun 18, 2024
f5bdb62
Fix that fallback scan quoted resets is_escaped.
wcawijngaards Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/fallback/scanner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ nonnull_all
static really_inline const char *scan_quoted(
parser_t *parser, const char *start, const char *end)
{
if (unlikely(parser->file->state.is_escaped))
if (unlikely(parser->file->state.is_escaped && start < end))
goto escaped;

while (start < end) {
if (*start == '\\') {
start++;
escaped:
if ((parser->file->state.is_escaped = (++start == end)))
if ((parser->file->state.is_escaped = (start == end)))
break;
assert(start < end);
*parser->file->newlines.tail += (*start == '\n');
Expand Down
53 changes: 51 additions & 2 deletions tests/syntax.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ void contiguous_escaped_start(void** state)
{
/* Check that the fallback parser handles a scan of a contiguous segment
* that starts with is_escaped. */
char* zone =
char* zone = PAD(
"$ORIGIN example.\n"
"$TTL 3600\n"
"@ IN SOA ns postmaster.mail 2147483647 3600 900 1814400 900\n"
Expand All @@ -1098,7 +1098,56 @@ void contiguous_escaped_start(void** state)
"0000005 IN TYPE994 \\# 15 303132333435363738396162636465\n"
"0000006 IN A 192.0.2.6\n"
"0000006 IN TYPE994 \\# 16 30313233343536373839616263646566\n"
;
);
static uint8_t origin[] = { 0 };
zone_parser_t parser;
zone_name_buffer_t name;
zone_rdata_buffer_t rdata;
zone_buffers_t buffers = { 1, &name, &rdata };
zone_options_t options;
int32_t result;
(void) state;

memset(&options, 0, sizeof(options));
options.accept.callback = contiguous_escaped_start_cb;
options.origin.octets = origin;
options.origin.length = sizeof(origin);
options.default_ttl = 3600;
options.default_class = ZONE_CLASS_IN;

result = zone_parse_string(&parser, &options, &buffers, zone, strlen(zone),
NULL);
assert_int_equal(result, ZONE_SUCCESS);
}

/*!cmocka */
void quoted_escaped_start(void** state)
{
/* Check that the fallback parser handles a scan of a quoted segment
* that starts with is_escaped. */
char* zone = PAD(
"$ORIGIN example.\n"
"$TTL 3600\n"
"@ IN SOA ns postmaster.mail 2147483647 3600 900 1814400 900\n"
" IN NS ns\n"
"ns IN A 203.0.113.53\n"
"ns IN AAAA 2001:db8:feed:beef::53\n"
"\n"
"0000000 IN A 192.0.2.0\n"
"0000000 IN TYPE994 \\# 10 30313233343536373839\n"
"0000001 IN A 192.0.2.1\n"
"0000001 IN TYPE994 \\# 11 3031323334353637383961\n"
"0000002 IN A 192.0.2.2\n"
"0000002 IN TYPE994 \\# 12 303132333435363738396162\n"
"0000003 IN A 192.0.2.3\n"
"0000003 IN TYPE994 \\# 13 30313233343536373839616263\n"
"0000004 IN A 192.0.2.4\n"
"0000004 IN TYPE994 \\# 14 3031323334353637383961626364\n"
"0000005 IN A 192.0.2.5\n"
"0000005 IN TYPE994 \\# 15 303132333435363738396162636465\n"
"0000006 IN A 192.0.2.6\n"
"0000006 IN TXT \"aaa\\#\"\n"
);
static uint8_t origin[] = { 0 };
zone_parser_t parser;
zone_name_buffer_t name;
Expand Down