zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-17 17:58:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: out_of_range with malformed toml file #164

Browse Source
This commit is contained in:
ToruNiina
2021-06-27 15:58:40 +09:00
parent 647381020e
commit 1b7ca8566b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
toml/parser.hpp
View File

@@ -1268,7 +1268,10 @@ insert_nested_key(typename Value::table_type& root, const Value& v,
} }
// the above if-else-if checks tab->at(k) is an array // the above if-else-if checks tab->at(k) is an array
auto& a = tab->at(k).as_array(); auto& a = tab->at(k).as_array();
if(!(a.front().is_table())) // If table element is defined as [[array_of_tables]], it
// cannot be an empty array. If an array of tables is
// defined as `aot = []`, it cannot be appended.
if(a.empty() || !(a.front().is_table()))
{ {
throw syntax_error(format_underline(concat_to_string( throw syntax_error(format_underline(concat_to_string(
"toml::insert_value: array of table (\"", "toml::insert_value: array of table (\"",
@@ -1510,6 +1513,7 @@ parse_inline_table(location& loc)
{ {
return err(kv_r.unwrap_err()); return err(kv_r.unwrap_err());
} }
const auto& kvpair = kv_r.unwrap(); const auto& kvpair = kv_r.unwrap();
const std::vector<key>& keys = kvpair.first.first; const std::vector<key>& keys = kvpair.first.first;
const auto& key_reg = kvpair.first.second; const auto& key_reg = kvpair.first.second;
@@ -1526,10 +1530,19 @@ parse_inline_table(location& loc)
using lex_table_separator = sequence<maybe<lex_ws>, character<','>>; using lex_table_separator = sequence<maybe<lex_ws>, character<','>>;
const auto sp = lex_table_separator::invoke(loc); const auto sp = lex_table_separator::invoke(loc);
if(!sp) if(!sp)
{ {
maybe<lex_ws>::invoke(loc); maybe<lex_ws>::invoke(loc);
if(loc.iter() != loc.end() && *loc.iter() == '}')
if(loc.iter() == loc.end())
{
throw syntax_error(format_underline(
"toml::parse_inline_table: missing table separator `}` ",
{{source_location(loc), "should be `}`"}}),
source_location(loc));
}
else if(*loc.iter() == '}')
{ {
loc.advance(); // skip `}` loc.advance(); // skip `}`
return ok(std::make_pair( return ok(std::make_pair(