update

Change-Id: I52bc6ba07505f2961e8bcac66d3159b280218960

Author: mateusz834

src/encoding/json/stream.go

@@ -19,7 +19,7 @@ type Decoder struct {
 	scanned     int64 // amount of data already scanned
 	scan        scanner
 	err         error
-	errFromMore bool
+	errFromMore error
 
 	tokenState int
 	tokenStack []int
@@ -48,14 +48,14 @@ func (dec *Decoder) DisallowUnknownFields() { dec.d.disallowUnknownFields = true
 // See the documentation for [Unmarshal] for details about
 // the conversion of JSON into a Go value.
 func (dec *Decoder) Decode(v any) error {
-	if dec.err != nil {
-		err := dec.err
-		if dec.errFromMore {
-			dec.err = nil
-			dec.errFromMore = false
-		}
+	if dec.errFromMore != nil {
+		err := dec.errFromMore
+		dec.errFromMore = nil
 		return err
 	}
+	if dec.err != nil {
+		return dec.err
+	}
 
 	if err := dec.tokenPrepareForDecode(); err != nil {
 		return err
@@ -371,10 +371,9 @@ func (d Delim) String() string {
 // to mark the start and end of arrays and objects.
 // Commas and colons are elided.
 func (dec *Decoder) Token() (Token, error) {
-	if dec.err != nil && dec.errFromMore {
-		err := dec.err
-		dec.err = nil
-		dec.errFromMore = false
+	if dec.errFromMore != nil {
+		err := dec.errFromMore
+		dec.errFromMore = nil
 		return nil, err
 	}
 
@@ -496,10 +495,13 @@ func (dec *Decoder) More() bool {
 	c, err := dec.peek()
 	if err != nil {
 		if err == io.EOF {
+			// More was called directly after an non-EOF error also from More,
+			// this time we've got a io.EOF error, clear it from dec.err, now we
+			// are sure that there are no more bytes to be read.
+			dec.errFromMore = nil
 			return false
 		}
-		dec.err = err
-		dec.errFromMore = true
+		dec.errFromMore = err
 		return true
 	}
 	return c != ']' && c != '}'