BIND 10 trac1072, updated. ec45081d781ae19de834b11e000acc35415a8f30 [trac1072] review comments

[BIND 10 source code commits]

The branch, trac1072 has been updated
       via  ec45081d781ae19de834b11e000acc35415a8f30 (commit)
      from  b9ad6d4babd3e10f1c13140e53d60181681a5def (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec45081d781ae19de834b11e000acc35415a8f30
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jul 1 15:55:37 2011 +0200

    [trac1072] review comments

-----------------------------------------------------------------------

Summary of changes:
 src/lib/cc/data.cc                 |    3 +--
 src/lib/cc/tests/data_unittests.cc |    5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/cc/data.cc b/src/lib/cc/data.cc
index 3f630ef..b7627c7 100644
--- a/src/lib/cc/data.cc
+++ b/src/lib/cc/data.cc
@@ -456,8 +456,7 @@ from_stringstream_map(std::istream &in, const std::string& file, int& line,
     char c = in.peek();
     if (c == EOF) {
         throwJSONError(std::string("Unterminated map, <string> or } expected"), file, line, pos);
-    }
-    if (c == '}') {
+    } else if (c == '}') {
         // empty map, skip closing curly
         c = in.get();
     } else {
diff --git a/src/lib/cc/tests/data_unittests.cc b/src/lib/cc/tests/data_unittests.cc
index 2f0a61c..53d5ab8 100644
--- a/src/lib/cc/tests/data_unittests.cc
+++ b/src/lib/cc/tests/data_unittests.cc
@@ -409,6 +409,11 @@ TEST(Element, to_and_from_wire) {
     EXPECT_THROW(Element::fromJSON("[ 1, 2, }"), isc::data::JSONError);
     EXPECT_THROW(Element::fromJSON("[ 1, 2, {}"), isc::data::JSONError);
     EXPECT_THROW(Element::fromJSON("[ 1, 2, { ]"), isc::data::JSONError);
+    EXPECT_THROW(Element::fromJSON("[ "), isc::data::JSONError);
+    EXPECT_THROW(Element::fromJSON("{{}}"), isc::data::JSONError);
+    EXPECT_THROW(Element::fromJSON("{[]}"), isc::data::JSONError);
+    EXPECT_THROW(Element::fromJSON("{ \"a\", \"b\" }"), isc::data::JSONError);
+    EXPECT_THROW(Element::fromJSON("[ \"a\": \"b\" ]"), isc::data::JSONError);
 }
 
 ConstElementPtr