Fix crash when parsing `{x:` (#865)

f05b2577 · Raúl Gutiérrez Segalés · GitHub · d9c35b60 · f05b2577 · f05b2577
Unverified Commit f05b2577 authored May 23, 2020 by Raúl Gutiérrez Segalés Committed by GitHub May 23, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

src/exp.h src/exp.h +1 -1

test/integration/node_spec_test.cpp test/integration/node_spec_test.cpp +5 -0

No files found.
--- a/src/exp.h
+++ b/src/exp.h
@@ -155,7 +155,7 @@ inline const RegEx& PlainScalar() {
 inline const RegEx& PlainScalarInFlow() {
  static const RegEx e =
      !(BlankOrBreak() | RegEx("?,[]{}#&*!|>\'\"%@`", REGEX_OR) |
-        (RegEx("-:", REGEX_OR) + Blank()));
+        (RegEx("-:", REGEX_OR) + (Blank() | RegEx())));
  return e;
 }
 inline const RegEx& EndScalar() {

--- a/test/integration/node_spec_test.cpp
+++ b/test/integration/node_spec_test.cpp
@@ -1127,5 +1127,10 @@ TEST(NodeSpecTest, Ex8_22_BlockCollectionNodes) {
  EXPECT_EQ(1, doc["mapping"].size());
  EXPECT_EQ("bar", doc["mapping"]["foo"].as<std::string>());
 }
+
+TEST(NodeSpecTest, FlowMapNotClosed) {
+  EXPECT_THROW_PARSER_EXCEPTION(Load("{x:"), ErrorMsg::UNKNOWN_TOKEN);
+}
+
 }
 }