From 2c340f0546df808d5d75ef4a4ccbbf30482d5e77 Mon Sep 17 00:00:00 2001
From: Jesse Beder <jbeder+github@gmail.com>
Date: Sat, 16 Aug 2014 10:52:51 -0500
Subject: [PATCH] Fixed memory corruption when using a node as a key

---
 include/yaml-cpp/node/impl.h |  2 ++
 test/node/node_test.cpp      | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h
index 425e37f..e79d562 100644
--- a/include/yaml-cpp/node/impl.h
+++ b/include/yaml-cpp/node/impl.h
@@ -380,6 +380,7 @@ inline const Node Node::operator[](const Node& key) const {
     throw InvalidNode();
   EnsureNodeExists();
   key.EnsureNodeExists();
+  m_pMemory->merge(*key.m_pMemory);
   detail::node& value =
       static_cast<const detail::node&>(*m_pNode).get(*key.m_pNode, m_pMemory);
   return Node(value, m_pMemory);
@@ -390,6 +391,7 @@ inline Node Node::operator[](const Node& key) {
     throw InvalidNode();
   EnsureNodeExists();
   key.EnsureNodeExists();
+  m_pMemory->merge(*key.m_pMemory);
   detail::node& value = m_pNode->get(*key.m_pNode, m_pMemory);
   return Node(value, m_pMemory);
 }
diff --git a/test/node/node_test.cpp b/test/node/node_test.cpp
index 0c16a57..736a068 100644
--- a/test/node/node_test.cpp
+++ b/test/node/node_test.cpp
@@ -258,5 +258,16 @@ TEST(NodeTest, CloneNull) {
   Node clone = Clone(node);
   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;
+  }
+}
 }
 }