decode: Don't be greedy unless we're looking for EOF

1 files changed, 17 insertions, 16 deletions

diff --git a/decode.go b/decode.go
index 52fcb5e..9c05860 100644
--- a/decode.go
+++ b/decode.go
@@ -130,15 +130,25 @@ func DecodeThenEOF(r interface {
 	if err := dec.Decode(ptr); err != nil {
 		return err
 	}
-	if c, _, err := r.ReadRune(); err == nil {
-		return &DecodeError{
-			Err: &DecodeSyntaxError{
-				Err:    fmt.Errorf("invalid character %q after top-level value", c),
-				Offset: dec.InputOffset(),
-			},
+	for {
+		c, s, t, _ := dec.io.ReadRuneType()
+		switch t {
+		case RuneTypeSpace:
+			// do nothing
+		case RuneTypeEOF:
+			if s > 0 {
+				return &DecodeError{
+					Err: &DecodeSyntaxError{
+						Err:    fmt.Errorf("invalid character %q after top-level value", c),
+						Offset: dec.InputOffset(),
+					},
+				}
+			}
+			return nil
+		default:
+			panic("should not happen")
 		}
 	}
-	return nil
 }
 
 func (dec *Decoder) Decode(ptr any) (err error) {
@@ -167,15 +177,6 @@ func (dec *Decoder) Decode(ptr any) (err error) {
 		}
 	}()
 	dec.decode(ptrVal.Elem(), false)
-	for {
-		_, s, t, _ := dec.io.ReadRuneType()
-		if t == RuneTypeEOF || t == RuneTypeError {
-			if s > 0 {
-				dec.io.UnreadRune()
-			}
-			break
-		}
-	}
 	return nil
 }