AuroraMiddleware/tomlplusplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed parser null deref when exceptions are disabled

Browse Source 
closes #169
This commit is contained in:
Mark Gillard 2022-08-31 14:49:23 +03:00
parent 4b166b69f2
commit 7876c96aae
5 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -12,8 +12,18 @@ template:
#### Removals:
#### Build system:
<br><br>
-->
## Unreleased
#### Fixes:
- fixed null pointer dereference in parser when exceptions are disabled (#169) (@ncaklovic)
<br><br>
## v3.2.0
[Released](https://github.com/marzer/tomlplusplus/releases/tag/v3.2.0) 2022-08-29

1
include/toml++/impl/array.inl
View File

@ -130,6 +130,7 @@ TOML_NAMESPACE_START
TOML_EXTERNAL_LINKAGE
void array::insert_at_back(impl::node_ptr && elem)
{
TOML_ASSERT(elem);
elems_.push_back(std::move(elem));
}

32
include/toml++/impl/parser.inl
View File

@ -3556,13 +3556,13 @@ TOML_IMPL_NAMESPACE_START
node_ptr arr_ptr{ new array{} };
array& arr = arr_ptr->ref_cast<array>();
enum TOML_CLOSED_ENUM parse_elem : int
enum class TOML_CLOSED_ENUM parse_type : int
{
none,
comma,
val
};
parse_elem prev = none;
parse_type prev = parse_type::none;
while (!is_error())
{
@ -3573,9 +3573,9 @@ TOML_IMPL_NAMESPACE_START
// commas - only legal after a value
if (*cp == U',')
{
if (prev == val)
if (prev == parse_type::val)
{
prev = comma;
prev = parse_type::comma;
advance_and_return_if_error_or_eof({});
continue;
}
@ -3592,15 +3592,19 @@ TOML_IMPL_NAMESPACE_START
// must be a value
else
{
if (prev == val)
if (prev == parse_type::val)
{
set_error_and_return_default("expected comma or closing ']', saw '"sv, to_sv(*cp), "'"sv);
continue;
}
prev = val;
prev = parse_type::val;
auto val = parse_value();
return_if_error({});
if (!arr.capacity())
arr.reserve(4u);
arr.emplace_back<node_ptr>(parse_value());
arr.emplace_back<node_ptr>(std::move(val));
}
}
@ -3624,13 +3628,13 @@ TOML_IMPL_NAMESPACE_START
tbl.is_inline(true);
table_vector_scope table_scope{ open_inline_tables, tbl };
enum TOML_CLOSED_ENUM parse_elem : int
enum class TOML_CLOSED_ENUM parse_type : int
{
none,
comma,
kvp
};
parse_elem prev = none;
parse_type prev = parse_type::none;
while (!is_error())
{
if constexpr (TOML_LANG_UNRELEASED) // toml/issues/516 (newlines/trailing commas in inline tables)
@ -3649,9 +3653,9 @@ TOML_IMPL_NAMESPACE_START
// commas - only legal after a key-value pair
if (*cp == U',')
{
if (prev == kvp)
if (prev == parse_type::kvp)
{
prev = comma;
prev = parse_type::comma;
advance_and_return_if_error_or_eof({});
}
else
@ -3663,7 +3667,7 @@ TOML_IMPL_NAMESPACE_START
{
if constexpr (!TOML_LANG_UNRELEASED) // toml/issues/516 (newlines/trailing commas in inline tables)
{
if (prev == comma)
if (prev == parse_type::comma)
{
set_error_and_return_default("expected key-value pair, saw closing '}' (dangling comma)"sv);
continue;
@ -3676,11 +3680,11 @@ TOML_IMPL_NAMESPACE_START
// key-value pair
else if (is_string_delimiter(*cp) || is_bare_key_character(*cp))
{
if (prev == kvp)
if (prev == parse_type::kvp)
set_error_and_return_default("expected comma or closing '}', saw '"sv, to_sv(*cp), "'"sv);
else
{
prev = kvp;
prev = parse_type::kvp;
parse_key_value_pair_and_insert(&tbl);
}
}

8
tests/user_feedback.cpp
View File

@ -367,4 +367,12 @@ b = []
foo = 1
)"sv);
}
SECTION("tomlplusplus/issues/169") // https://github.com/marzer/tomlplusplus/issues/169
{
parsing_should_fail(FILE_LINE_ARGS, R"(
[a]
b = [c"]
)"sv);
}
}

33
toml.hpp
View File

@ -11311,6 +11311,7 @@ TOML_NAMESPACE_START
TOML_EXTERNAL_LINKAGE
void array::insert_at_back(impl::node_ptr && elem)
{
TOML_ASSERT(elem);
elems_.push_back(std::move(elem));
}
@ -15512,13 +15513,13 @@ TOML_IMPL_NAMESPACE_START
node_ptr arr_ptr{ new array{} };
array& arr = arr_ptr->ref_cast<array>();
enum TOML_CLOSED_ENUM parse_elem : int
enum class TOML_CLOSED_ENUM parse_type : int
{
none,
comma,
val
};
parse_elem prev = none;
parse_type prev = parse_type::none;
while (!is_error())
{
@ -15529,9 +15530,9 @@ TOML_IMPL_NAMESPACE_START
// commas - only legal after a value
if (*cp == U',')
{
if (prev == val)
if (prev == parse_type::val)
{
prev = comma;
prev = parse_type::comma;
advance_and_return_if_error_or_eof({});
continue;
}
@ -15548,15 +15549,19 @@ TOML_IMPL_NAMESPACE_START
// must be a value
else
{
if (prev == val)
if (prev == parse_type::val)
{
set_error_and_return_default("expected comma or closing ']', saw '"sv, to_sv(*cp), "'"sv);
continue;
}
prev = val;
prev = parse_type::val;
auto val = parse_value();
return_if_error({});
if (!arr.capacity())
arr.reserve(4u);
arr.emplace_back<node_ptr>(parse_value());
arr.emplace_back<node_ptr>(std::move(val));
}
}
@ -15580,13 +15585,13 @@ TOML_IMPL_NAMESPACE_START
tbl.is_inline(true);
table_vector_scope table_scope{ open_inline_tables, tbl };
enum TOML_CLOSED_ENUM parse_elem : int
enum class TOML_CLOSED_ENUM parse_type : int
{
none,
comma,
kvp
};
parse_elem prev = none;
parse_type prev = parse_type::none;
while (!is_error())
{
if constexpr (TOML_LANG_UNRELEASED) // toml/issues/516 (newlines/trailing commas in inline tables)
@ -15605,9 +15610,9 @@ TOML_IMPL_NAMESPACE_START
// commas - only legal after a key-value pair
if (*cp == U',')
{
if (prev == kvp)
if (prev == parse_type::kvp)
{
prev = comma;
prev = parse_type::comma;
advance_and_return_if_error_or_eof({});
}
else
@ -15619,7 +15624,7 @@ TOML_IMPL_NAMESPACE_START
{
if constexpr (!TOML_LANG_UNRELEASED) // toml/issues/516 (newlines/trailing commas in inline tables)
{
if (prev == comma)
if (prev == parse_type::comma)
{
set_error_and_return_default("expected key-value pair, saw closing '}' (dangling comma)"sv);
continue;
@ -15632,11 +15637,11 @@ TOML_IMPL_NAMESPACE_START
// key-value pair
else if (is_string_delimiter(*cp) || is_bare_key_character(*cp))
{
if (prev == kvp)
if (prev == parse_type::kvp)
set_error_and_return_default("expected comma or closing '}', saw '"sv, to_sv(*cp), "'"sv);
else
{
prev = kvp;
prev = parse_type::kvp;
parse_key_value_pair_and_insert(&tbl);
}
}