From 1e13e1e06e7f2014cdf03940f4c86dbd74a09c5e Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Fri, 30 Jan 2015 17:21:50 -0600
Subject: [PATCH] Fix sequence warnings (fix #686)

---
 jv_parse.c | 51 ++++++++++++++++++++++++++++++---------------------
 tests/run  |  2 +-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/jv_parse.c b/jv_parse.c
index c9e2cf28..165f0994 100644
--- a/jv_parse.c
+++ b/jv_parse.c
@@ -554,27 +554,34 @@ static int stream_check_done(struct jv_parser* p, jv* out) {
   }
 }
 
-static int parse_check_truncation(struct jv_parser* p, jv out) {
-  return ((p->flags & JV_PARSE_SEQ) && !p->last_ch_was_ws && jv_get_kind(out) == JV_KIND_NUMBER);
+static int parse_check_truncation(struct jv_parser* p) {
+  return ((p->flags & JV_PARSE_SEQ) && !p->last_ch_was_ws && (p->stackpos > 0 || p->tokenpos > 0 || jv_get_kind(p->next) == JV_KIND_NUMBER));
 }
 
-static int stream_check_truncation(struct jv_parser* p, jv out) {
-  if (!jv_is_valid(out))
-    return 0;
-  jv v = jv_array_get(jv_copy(out), 1);
-  jv_kind k = jv_get_kind(v);
-  jv_free(v);
-  return (k == JV_KIND_NUMBER || k == JV_KIND_TRUE || k == JV_KIND_FALSE || k == JV_KIND_NULL);
+static int stream_check_truncation(struct jv_parser* p) {
+  jv_kind k = jv_get_kind(p->next);
+  return (p->stacklen > 0 || k == JV_KIND_NUMBER || k == JV_KIND_TRUE || k == JV_KIND_FALSE || k == JV_KIND_NULL);
 }
 
-#define check_done(p, out) \
-   (((p)->flags & JV_PARSE_STREAMING) ? stream_check_done((p), (out)) : parse_check_done((p), (out)))
+static int parse_is_top_num(struct jv_parser* p) {
+  return (p->stackpos == 0 && jv_get_kind(p->next) == JV_KIND_NUMBER);
+}
+
+static int stream_is_top_num(struct jv_parser* p) {
+  return (p->stacklen == 0 && jv_get_kind(p->next) == JV_KIND_NUMBER);
+}
+
+#define check_done(p, o) \
+   (((p)->flags & JV_PARSE_STREAMING) ? stream_check_done((p), (o)) : parse_check_done((p), (o)))
 
 #define token(p, ch) \
    (((p)->flags & JV_PARSE_STREAMING) ? stream_token((p), (ch)) : parse_token((p), (ch)))
 
-#define check_truncation(p, o) \
-    (((p)->flags & JV_PARSE_STREAMING) ? stream_check_truncation((p), (o)) : parse_check_truncation((p), (o)))
+#define check_truncation(p) \
+   (((p)->flags & JV_PARSE_STREAMING) ? stream_check_truncation((p)) : parse_check_truncation((p)))
+
+#define is_top_num(p) \
+   (((p)->flags & JV_PARSE_STREAMING) ? stream_is_top_num((p)) : parse_is_top_num((p)))
 
 static pfunc scan(struct jv_parser* p, char ch, jv* out) {
   p->column++;
@@ -583,19 +590,21 @@ static pfunc scan(struct jv_parser* p, char ch, jv* out) {
     p->column = 0;
   }
   if (ch == '\036' /* ASCII RS; see draft-ietf-json-sequence-07 */) {
-    TRY(check_literal(p));
-    if (p->st == JV_PARSER_NORMAL && check_done(p, out)) {
-      if (check_truncation(p, *out)) {
-        jv_free(*out);
-        *out = jv_invalid();
+    if (check_truncation(p)) {
+      if (check_literal(p) == 0 && is_top_num(p))
         return "Potentially truncated top-level numeric value";
-      }
-      return OK;
+      return "Truncated value";
     }
+    TRY(check_literal(p));
+    if (p->st == JV_PARSER_NORMAL && check_done(p, out))
+      return OK;
+    // shouldn't happen?
+    assert(!jv_is_valid(*out));
+    assert(!jv_is_valid(p->next));
     parser_reset(p);
     jv_free(*out);
     *out = jv_invalid();
-    return "Truncated value";
+    return OK;
   }
   presult answer = 0;
   p->last_ch_was_ws = 0;
diff --git a/tests/run b/tests/run
index 36a09c1f..bb7d0727 100755
--- a/tests/run
+++ b/tests/run
@@ -104,7 +104,7 @@ cat > $d/expected <<EOF
 ignoring parse error: Potentially truncated top-level numeric value at line 1, column 2
 ignoring parse error: Truncated value at line 2, column 5
 ignoring parse error: Truncated value at line 2, column 25
-ignoring parse error: Invalid literal at line 3, column 1
+ignoring parse error: Truncated value at line 3, column 1
 EOF
 printf '1\0362 3\n[0,1\036[4,5]true"ab"{"c":4\036{}{"d":5,"e":6"false\n\036null'|$VALGRIND $Q ./jq -ces --seq '. == [2,3,[4,5],true,"ab",{},null]' > /dev/null 2> $d/out
 cmp $d/out $d/expected