Merge lp:~marcustomlinson/unity-scopes-api/lp-1494796 into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Protect all JsonCppNode::get_node() methods with a "if (!root_) throw;" check

[Paweł Stołowski (stolowski)]

Yeah, looking good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/scopes/internal/JsonCppNode.cpp'
--- src/scopes/internal/JsonCppNode.cpp	2015-07-13 08:44:43 +0000
+++ src/scopes/internal/JsonCppNode.cpp	2015-09-15 09:13:51 +0000
@@ -279,6 +279,11 @@
 
 JsonNodeInterface::SPtr JsonCppNode::get_node(std::string const& node_name) const
 {
+    if (!root_)
+    {
+        throw unity::LogicException("Current node is empty");
+    }
+
     if (!root_.isMember(node_name))
     {
         throw unity::LogicException("Node " + node_name + " does not exist");
@@ -290,6 +295,11 @@
 
 JsonNodeInterface::SPtr JsonCppNode::get_node(unsigned int node_index) const
 {
+    if (!root_)
+    {
+        throw unity::LogicException("Current node is empty");
+    }
+
     if (root_.type() != Json::arrayValue)
     {
         throw unity::LogicException("Root node is not an array");