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

Fixed memory corruption when using a node as a key

Browse Source
This commit is contained in:
Jesse Beder
2014-08-16 10:52:51 -05:00
parent 1aa25e7679
commit 2c340f0546
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -380,6 +380,7 @@ inline const Node Node::operator[](const Node& key) const {
throw InvalidNode(); throw InvalidNode();
EnsureNodeExists(); EnsureNodeExists();
key.EnsureNodeExists(); key.EnsureNodeExists();
m_pMemory->merge(*key.m_pMemory);
detail::node& value = detail::node& value =
static_cast<const detail::node&>(*m_pNode).get(*key.m_pNode, m_pMemory); static_cast<const detail::node&>(*m_pNode).get(*key.m_pNode, m_pMemory);
return Node(value, m_pMemory); return Node(value, m_pMemory);
@@ -390,6 +391,7 @@ inline Node Node::operator[](const Node& key) {
throw InvalidNode(); throw InvalidNode();
EnsureNodeExists(); EnsureNodeExists();
key.EnsureNodeExists(); key.EnsureNodeExists();
m_pMemory->merge(*key.m_pMemory);
detail::node& value = m_pNode->get(*key.m_pNode, m_pMemory); detail::node& value = m_pNode->get(*key.m_pNode, m_pMemory);
return Node(value, m_pMemory); return Node(value, m_pMemory);
} }

11
test/node/node_test.cpp
View File

@@ -258,5 +258,16 @@ TEST(NodeTest, CloneNull) {
Node clone = Clone(node); Node clone = Clone(node);
EXPECT_EQ(NodeType::Null, clone.Type()); EXPECT_EQ(NodeType::Null, clone.Type());
} }
TEST(NodeTest, KeyNodeExitsScope) {
Node node;
{
Node temp("Hello, world");
node[temp] = 0;
}
for (const auto &kv : node) {
(void)kv;
}
}
} }
} }