xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tomKPZ/fix-buffer-overflow'

Browse Source
This commit is contained in:
Maxime Coste 2022-03-21 20:52:07 +11:00
commit bde59926be
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/command_manager.cc
View File

@ -132,7 +132,7 @@ ParseResult parse_quoted(ParseState& state, Delimiter delimiter)
if (c == delimiter) if (c == delimiter)
{ {
auto next = state.pos; auto next = state.pos;
if (read(next, end) != delimiter) if (next == end || read(next, end) != delimiter)
{ {
if (str.empty()) if (str.empty())
return {String{String::NoCopy{}, {beg, cur}}, true}; return {String{String::NoCopy{}, {beg, cur}}, true};
@ -815,15 +815,20 @@ UnitTest test_command_parsing{[]
{ {
auto check_quoted = [](StringView str, bool terminated, StringView content) auto check_quoted = [](StringView str, bool terminated, StringView content)
{ {
ParseState state{str, str.begin()}; auto check_quoted_impl = [&](auto type_hint) {
const Codepoint delimiter = *state.pos++; ParseState state{str, str.begin()};
auto quoted = parse_quoted(state, delimiter); const decltype(type_hint) delimiter = *state.pos++;
kak_assert(quoted.terminated == terminated); auto quoted = parse_quoted(state, delimiter);
kak_assert(quoted.content == content); kak_assert(quoted.terminated == terminated);
kak_assert(quoted.content == content);
};
check_quoted_impl(Codepoint{});
check_quoted_impl(char{});
}; };
check_quoted("'abc'", true, "abc"); check_quoted("'abc'", true, "abc");
check_quoted("'abc''def", false, "abc'def"); check_quoted("'abc''def", false, "abc'def");
check_quoted("'abc''def'''", true, "abc'def'"); check_quoted("'abc''def'''", true, "abc'def'");
check_quoted(StringView("'abc''def'", 5), true, "abc");
auto check_balanced = [](StringView str, bool terminated, StringView content) auto check_balanced = [](StringView str, bool terminated, StringView content)
{ {