From 587f5a9a309feebee7bf069f762f5702baf4699e Mon Sep 17 00:00:00 2001
From: Florin Malita <fmalita@chromium.org>
Date: Fri, 15 Jun 2018 09:21:36 -0400
Subject: [skjson] Catch end-of-stream for unbalanced scopes

The input is not guaranteed to contain well-formed scopes, so it's not
sufficient to check for end-of-stream only when popping the top-level
scope -- we have to check on every scope pop.

Bug: oss-fuzz:8898
Change-Id: I7399a8872187ec6714672cac2ff8fc7fbf3c2dfe
Reviewed-on: https://skia-review.googlesource.com/135059
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
---
 modules/skjson/src/SkJSON.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules/skjson/src/SkJSON.cpp')

diff --git a/modules/skjson/src/SkJSON.cpp b/modules/skjson/src/SkJSON.cpp
index 7f082d7294..d423715947 100644
--- a/modules/skjson/src/SkJSON.cpp
+++ b/modules/skjson/src/SkJSON.cpp
@@ -355,6 +355,10 @@ public:
                 : this->error(NullValue(), p + 1, "trailing root garbage");
         }
 
+        if (p == p_stop) {
+            return this->error(NullValue(), p, "unexpected end-of-input");
+        }
+
         ++p;
 
         goto match_post_value;
-- 
cgit v1.2.3