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

Fixed crash when emitting empty node

Browse Source
This commit is contained in:
Jesse Beder
2013-07-10 08:29:11 -05:00
parent dd0f2577ae
commit 0305ad13e4
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nodeevents.cpp
View File

@@ -19,9 +19,10 @@ namespace YAML
return it->second; return it->second;
} }
NodeEvents::NodeEvents(const Node& node): m_pMemory(node.m_pMemory), m_root(*node.m_pNode) NodeEvents::NodeEvents(const Node& node): m_pMemory(node.m_pMemory), m_root(node.m_pNode)
{ {
Setup(m_root); if(m_root)
Setup(*m_root);
} }
void NodeEvents::Setup(const detail::node& node) void NodeEvents::Setup(const detail::node& node)
@@ -47,7 +48,8 @@ namespace YAML
AliasManager am; AliasManager am;
handler.OnDocumentStart(Mark()); handler.OnDocumentStart(Mark());
Emit(m_root, handler, am); if(m_root)
Emit(*m_root, handler, am);
handler.OnDocumentEnd(); handler.OnDocumentEnd();
} }

2
src/nodeevents.h
View File

@@ -46,7 +46,7 @@ namespace YAML
private: private:
detail::shared_memory_holder m_pMemory; detail::shared_memory_holder m_pMemory;
detail::node& m_root; detail::node* m_root;
typedef std::map<const detail::node_ref *, int> RefCount; typedef std::map<const detail::node_ref *, int> RefCount;
RefCount m_refCount; RefCount m_refCount;

2
src/ostream_wrapper.cpp
View File

@@ -4,7 +4,7 @@
namespace YAML namespace YAML
{ {
ostream_wrapper::ostream_wrapper(): m_pStream(0), m_pos(0), m_row(0), m_col(0), m_comment(false) ostream_wrapper::ostream_wrapper(): m_buffer(1), m_pStream(0), m_pos(0), m_row(0), m_col(0), m_comment(false)
{ {
} }

10
test/new-api/nodetests.cpp
View File

@@ -506,6 +506,15 @@ namespace Test
YAML_ASSERT(node.as<double>() == x); YAML_ASSERT(node.as<double>() == x);
return true; return true;
} }
TEST EmitEmptyNode()
{
YAML::Node node;
YAML::Emitter emitter;
emitter << node;
YAML_ASSERT(std::string(emitter.c_str()) == "");
return true;
}
} }
void RunNodeTest(TEST (*test)(), const std::string& name, int& passed, int& total) { void RunNodeTest(TEST (*test)(), const std::string& name, int& passed, int& total) {
@@ -569,6 +578,7 @@ namespace Test
RunNodeTest(&Node::ResetNode, "reset node", passed, total); RunNodeTest(&Node::ResetNode, "reset node", passed, total);
RunNodeTest(&Node::DereferenceIteratorError, "dereference iterator error", passed, total); RunNodeTest(&Node::DereferenceIteratorError, "dereference iterator error", passed, total);
RunNodeTest(&Node::FloatingPrecision, "floating precision", passed, total); RunNodeTest(&Node::FloatingPrecision, "floating precision", passed, total);
RunNodeTest(&Node::EmitEmptyNode, "emit empty node", passed, total);
std::cout << "Node tests: " << passed << "/" << total << " passed\n"; std::cout << "Node tests: " << passed << "/" << total << " passed\n";
return passed == total; return passed == total;