diff --git a/context_test.go b/context_test.go index e8d305e4..34299a16 100644 --- a/context_test.go +++ b/context_test.go @@ -1306,6 +1306,18 @@ func TestContextRenderNoContentSecureJSON(t *testing.T) { assert.Equal(t, "application/json; charset=utf-8", w.Header().Get("Content-Type")) } +func TestContextAsciiJSONNonBMP(t *testing.T) { + w := httptest.NewRecorder() + c, _ := CreateTestContext(w) + + // Non-BMP characters (emoji) should be encoded as UTF-16 surrogate pairs + c.AsciiJSON(http.StatusOK, H{"emoji": "😀"}) + + assert.Equal(t, http.StatusOK, w.Code) + assert.Equal(t, "{\"emoji\":\"\\ud83d\\ude00\"}", w.Body.String()) + assert.Equal(t, "application/json", w.Header().Get("Content-Type")) +} + func TestContextRenderNoContentAsciiJSON(t *testing.T) { w := httptest.NewRecorder() c, _ := CreateTestContext(w) diff --git a/render/json.go b/render/json.go index 2f98676c..6902c94d 100644 --- a/render/json.go +++ b/render/json.go @@ -10,6 +10,7 @@ import ( "html/template" "net/http" "unicode" + "unicode/utf16" "github.com/gin-gonic/gin/codec/json" "github.com/gin-gonic/gin/internal/bytesconv" @@ -160,11 +161,16 @@ func (r AsciiJSON) Render(w http.ResponseWriter) error { } var buffer bytes.Buffer - escapeBuf := make([]byte, 0, 6) // Preallocate 6 bytes for Unicode escape sequences + escapeBuf := make([]byte, 0, 12) // Preallocate for up to two \uXXXX sequences for _, r := range bytesconv.BytesToString(ret) { if r > unicode.MaxASCII { - escapeBuf = fmt.Appendf(escapeBuf[:0], "\\u%04x", r) // Reuse escapeBuf + if r > 0xFFFF { + surrogates := utf16.Encode([]rune{r}) + escapeBuf = fmt.Appendf(escapeBuf[:0], "\\u%04x\\u%04x", surrogates[0], surrogates[1]) + } else { + escapeBuf = fmt.Appendf(escapeBuf[:0], "\\u%04x", r) + } buffer.Write(escapeBuf) } else { buffer.WriteByte(byte(r))