From 7450960a1300a6f81da2abac63fcfbe0bccc6c50 Mon Sep 17 00:00:00 2001 From: itchyny Date: Mon, 2 Sep 2019 00:07:40 +0000 Subject: encoding/json: fix scanner byte offset on scanEnd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit scanEnd is delayed one byte so we decrement the scanner bytes count by 1 to ensure that this value is correct in the next call of Decode. Fixes #32399 Change-Id: I8c8698e7f95bbcf0373aceaa05319819eae9d86f GitHub-Last-Rev: 0ac25d8de23d38c7ac577faddc6983571023f561 GitHub-Pull-Request: golang/go#32598 Reviewed-on: https://go-review.googlesource.com/c/go/+/182117 Reviewed-by: Daniel Martí Run-TryBot: Daniel Martí TryBot-Result: Gobot Gobot --- src/encoding/json/stream.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/encoding/json/stream.go') diff --git a/src/encoding/json/stream.go b/src/encoding/json/stream.go index e29127499b..3d30322ce2 100644 --- a/src/encoding/json/stream.go +++ b/src/encoding/json/stream.go @@ -102,6 +102,10 @@ Input: dec.scan.bytes++ switch dec.scan.step(&dec.scan, c) { case scanEnd: + // scanEnd is delayed one byte so we decrement + // the scanner bytes count by 1 to ensure that + // this value is correct in the next call of Decode. + dec.scan.bytes-- break Input case scanEndObject, scanEndArray: // scanEnd is delayed one byte. -- cgit v1.3