Stop parsing JSON after first finished construct.

Makefile.am

@@ -50,6 +50,7 @@ EXTRA_DIST = \
 	fail31.json \
 	fail32.json \
 	fail33.json \
+	fail34.json \
 	fail3.json \
 	fail4.json \
 	fail5.json \

fail34.json

@@ -0,0 +1 @@
+{} garbage

unitester.cpp

@@ -91,6 +91,7 @@ static const char *filenames[] = {
         "fail31.json",
         "fail32.json",
         "fail33.json",
+        "fail34.json",
         "fail3.json",
         "fail4.json",                // extra comma
         "fail5.json",

univalue_read.cpp

@@ -244,16 +244,16 @@ bool UniValue::read(const char *raw)
     bool expectColon = false;
     vector<UniValue*> stack;
 
+    string tokenVal;
+    unsigned int consumed;
     enum jtokentype tok = JTOK_NONE;
     enum jtokentype last_tok = JTOK_NONE;
-    while (1) {
+    do {
         last_tok = tok;
 
-        string tokenVal;
-        unsigned int consumed;
         tok = getJsonToken(tokenVal, consumed, raw);
         if (tok == JTOK_NONE || tok == JTOK_ERR)
-            break;
+            return false;
         raw += consumed;
 
         switch (tok) {
@@ -377,9 +377,11 @@ bool UniValue::read(const char *raw)
         default:
             return false;
         }
-    }
+    } while (!stack.empty ());
 
-    if (stack.size() != 0)
+    /* Check that nothing follows the initial construct (parsed above).  */
+    tok = getJsonToken(tokenVal, consumed, raw);
+    if (tok != JTOK_NONE)
         return false;
 
     return true;