From e1e6c41c66b88db3e1a40fe62f32113a29f424e7 Mon Sep 17 00:00:00 2001
From: Nao Yonashiro <owan.orisano@gmail.com>
Date: Wed, 25 Aug 2021 06:05:59 +0900
Subject: [PATCH] fix: fixed invalid utf8 on stream decoder

---
 internal/decoder/string.go |  8 ++++++++
 stream_test.go             | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/internal/decoder/string.go b/internal/decoder/string.go
index 50e8835..8b83066 100644
--- a/internal/decoder/string.go
+++ b/internal/decoder/string.go
@@ -239,6 +239,14 @@ func stringBytes(s *Stream) ([]byte, error) {
 			fallthrough
 		default:
 			// multi bytes character
+			if !utf8.FullRune(s.buf[cursor : len(s.buf)-1]) {
+				s.cursor = cursor
+				if s.read() {
+					_, cursor, p = s.stat()
+					continue
+				}
+				goto ERROR
+			}
 			r, _ := utf8.DecodeRune(s.buf[cursor:])
 			b := []byte(string(r))
 			if r == utf8.RuneError {
diff --git a/stream_test.go b/stream_test.go
index 054747d..acebeee 100644
--- a/stream_test.go
+++ b/stream_test.go
@@ -14,7 +14,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"reflect"
-
+	"strconv"
 	"strings"
 	"testing"
 
@@ -502,3 +502,16 @@ func TestGzipStreaming(t *testing.T) {
 		t.Fatalf("Unexpected error: %v", err)
 	}
 }
+
+func TestLongUTF8(t *testing.T) {
+	want := strings.Repeat("あ", 342)
+	r := strings.NewReader(strconv.Quote(want))
+
+	var got string
+	if err := json.NewDecoder(r).Decode(&got); err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+	}
+	if got != want {
+		t.Errorf("string %q; want = %q", got, want)
+	}
+}