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 inconsistent Node::size when removing a key with unassigned node (#327) (#449)

Browse Source
This commit is contained in:
butataatawa
2016-12-06 15:40:00 +01:00
committed by Jesse Beder
parent e3492bb3fa
commit 147d909fe6
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/yaml-cpp/node/detail/impl.h
View File

@@ -132,6 +132,14 @@ inline bool node_data::remove(const Key& key, shared_memory_holder pMemory) {
if (m_type != NodeType::Map) if (m_type != NodeType::Map)
return false; return false;
kv_pairs::iterator it = m_undefinedPairs.begin();
while (it != m_undefinedPairs.end()) {
kv_pairs::iterator jt = std::next(it);
if (it->first->equals(key, pMemory))
m_undefinedPairs.erase(it);
it = jt;
}
for (node_map::iterator it = m_map.begin(); it != m_map.end(); ++it) { for (node_map::iterator it = m_map.begin(); it != m_map.end(); ++it) {
if (it->first->equals(key, pMemory)) { if (it->first->equals(key, pMemory)) {
m_map.erase(it); m_map.erase(it);

7
test/node/node_test.cpp
View File

@@ -88,6 +88,13 @@ TEST(NodeTest, MapWithUndefinedValues) {
EXPECT_EQ(2, node.size()); EXPECT_EQ(2, node.size());
} }
TEST(NodeTest, RemoveUnassignedNode) {
Node node(NodeType::Map);
node["key"];
node.remove("key");
EXPECT_EQ(node.size(), 0);
}
TEST(NodeTest, MapForceInsert) { TEST(NodeTest, MapForceInsert) {
Node node; Node node;
Node k1("k1"); Node k1("k1");