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

Fix operator bool() exception on zombie node

Browse Source
This commit is contained in:
Jesse Beder
2015-03-29 14:31:22 -05:00
parent 67e37d000a
commit 25b2ed0787
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/yaml-cpp/node/impl.h
View File

@@ -60,8 +60,9 @@ inline void Node::EnsureNodeExists() const {
} }
inline bool Node::IsDefined() const { inline bool Node::IsDefined() const {
if (!m_isValid) if (!m_isValid) {
throw InvalidNode(); return false;
}
return m_pNode ? m_pNode->is_defined() : true; return m_pNode ? m_pNode->is_defined() : true;
} }

4
test/integration/load_node_test.cpp
View File

@@ -181,8 +181,8 @@ TEST(LoadNodeTest, DereferenceIteratorError) {
EXPECT_THROW(node.begin()->first.as<int>(), InvalidNode); EXPECT_THROW(node.begin()->first.as<int>(), InvalidNode);
EXPECT_EQ(true, (*node.begin()).IsMap()); EXPECT_EQ(true, (*node.begin()).IsMap());
EXPECT_EQ(true, node.begin()->IsMap()); EXPECT_EQ(true, node.begin()->IsMap());
EXPECT_THROW((*node.begin()->begin()).IsDefined(), InvalidNode); EXPECT_THROW((*node.begin()->begin()).Type(), InvalidNode);
EXPECT_THROW(node.begin()->begin()->IsDefined(), InvalidNode); EXPECT_THROW(node.begin()->begin()->Type(), InvalidNode);
} }
TEST(NodeTest, EmitEmptyNode) { TEST(NodeTest, EmitEmptyNode) {

7
test/node/node_test.cpp
View File

@@ -281,6 +281,13 @@ TEST(NodeTest, DefaultNodeStyle) {
EXPECT_EQ(EmitterStyle::Default, node.Style()); EXPECT_EQ(EmitterStyle::Default, node.Style());
} }
TEST(NodeTest, AccessNonexistentKeyOnConstNode) {
YAML::Node node;
node["3"] = "4";
const YAML::Node& other = node;
ASSERT_FALSE(other["5"]);
}
class NodeEmitterTest : public ::testing::Test { class NodeEmitterTest : public ::testing::Test {
protected: protected:
void ExpectOutput(const std::string& output, const Node& node) { void ExpectOutput(const std::string& output, const Node& node) {