peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 20:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading empty token stack with a node with properties but no scalar.

Browse Source 
E.g. `!2`.
This commit is contained in:
Jesse Beder
2020-01-20 18:05:15 -06:00
parent 3dca8668b1
commit c9460110e0
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/singledocparser.cpp
View File

@@ -79,6 +79,12 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) {
if (!anchor_name.empty()) if (!anchor_name.empty())
eventHandler.OnAnchor(mark, anchor_name); eventHandler.OnAnchor(mark, anchor_name);
// after parsing properties, an empty node is again a possibility
if (m_scanner.empty()) {
eventHandler.OnNull(mark, anchor);
return;
}
const Token& token = m_scanner.peek(); const Token& token = m_scanner.peek();
if (token.type == Token::PLAIN_SCALAR && IsNullString(token.value)) { if (token.type == Token::PLAIN_SCALAR && IsNullString(token.value)) {

5
test/integration/load_node_test.cpp
View File

@@ -257,5 +257,10 @@ TEST(NodeTest, LoadTagWithParenthesis) {
EXPECT_EQ(node.as<std::string>(), "foo"); EXPECT_EQ(node.as<std::string>(), "foo");
} }
TEST(NodeTest, LoadTagWithNullScalar) {
Node node = Load("!2");
EXPECT_TRUE(node.IsNull());
}
} // namespace } // namespace
} // namespace YAML } // namespace YAML