From d12312b2b576f31bab0d6ef13ebdfa0ed84f2103 Mon Sep 17 00:00:00 2001
From: sunyongyue <sunyongyue@bytedance.com>
Date: Fri, 10 Mar 2023 15:37:16 +0800
Subject: [PATCH 1/2] fix: race in dynamicDecoder/dynamicEncoder

---
 reflect.go | 50 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/reflect.go b/reflect.go
index 39acb320..bd54db96 100644
--- a/reflect.go
+++ b/reflect.go
@@ -3,6 +3,7 @@ package jsoniter
 import (
 	"fmt"
 	"reflect"
+	"sync"
 	"unsafe"
 
 	"github.com/modern-go/reflect2"
@@ -36,9 +37,36 @@ type checkIsEmpty interface {
 
 type ctx struct {
 	*frozenConfig
-	prefix   string
-	encoders map[reflect2.Type]ValEncoder
-	decoders map[reflect2.Type]ValDecoder
+	prefix string
+	//encoders map[reflect2.Type]ValEncoder
+	//decoders map[reflect2.Type]ValDecoder
+
+	encoders *sync.Map
+	decoders *sync.Map
+}
+
+func (c *ctx) getEncoder(t reflect2.Type) ValEncoder {
+	encoder, found := c.encoders.Load(t)
+	if found {
+		return encoder.(ValEncoder)
+	}
+	return nil
+}
+
+func (c *ctx) addEncoder(t reflect2.Type, v ValEncoder) {
+	c.encoders.Store(t, v)
+}
+
+func (c *ctx) getDecoder(t reflect2.Type) ValDecoder {
+	encoder, found := c.encoders.Load(t)
+	if found {
+		return encoder.(ValDecoder)
+	}
+	return nil
+}
+
+func (c *ctx) addDecoder(t reflect2.Type, v ValDecoder) {
+	c.encoders.Store(t, v)
 }
 
 func (b *ctx) caseSensitive() bool {
@@ -107,8 +135,8 @@ func (cfg *frozenConfig) DecoderOf(typ reflect2.Type) ValDecoder {
 	ctx := &ctx{
 		frozenConfig: cfg,
 		prefix:       "",
-		decoders:     map[reflect2.Type]ValDecoder{},
-		encoders:     map[reflect2.Type]ValEncoder{},
+		decoders:     &sync.Map{},
+		encoders:     &sync.Map{},
 	}
 	ptrType := typ.(*reflect2.UnsafePtrType)
 	decoder = decoderOfType(ctx, ptrType.Elem())
@@ -133,14 +161,14 @@ func decoderOfType(ctx *ctx, typ reflect2.Type) ValDecoder {
 }
 
 func createDecoderOfType(ctx *ctx, typ reflect2.Type) ValDecoder {
-	decoder := ctx.decoders[typ]
+	decoder := ctx.getDecoder(typ)
 	if decoder != nil {
 		return decoder
 	}
 	placeholder := &placeholderDecoder{}
-	ctx.decoders[typ] = placeholder
 	decoder = _createDecoderOfType(ctx, typ)
 	placeholder.decoder = decoder
+	ctx.addDecoder(typ, placeholder)
 	return decoder
 }
 
@@ -196,8 +224,8 @@ func (cfg *frozenConfig) EncoderOf(typ reflect2.Type) ValEncoder {
 	ctx := &ctx{
 		frozenConfig: cfg,
 		prefix:       "",
-		decoders:     map[reflect2.Type]ValDecoder{},
-		encoders:     map[reflect2.Type]ValEncoder{},
+		decoders:     &sync.Map{},
+		encoders:     &sync.Map{},
 	}
 	encoder = encoderOfType(ctx, typ)
 	if typ.LikePtr() {
@@ -236,14 +264,14 @@ func encoderOfType(ctx *ctx, typ reflect2.Type) ValEncoder {
 }
 
 func createEncoderOfType(ctx *ctx, typ reflect2.Type) ValEncoder {
-	encoder := ctx.encoders[typ]
+	encoder := ctx.getEncoder(typ)
 	if encoder != nil {
 		return encoder
 	}
 	placeholder := &placeholderEncoder{}
-	ctx.encoders[typ] = placeholder
 	encoder = _createEncoderOfType(ctx, typ)
 	placeholder.encoder = encoder
+	ctx.addEncoder(typ, placeholder)
 	return encoder
 }
 func _createEncoderOfType(ctx *ctx, typ reflect2.Type) ValEncoder {

From f5f5d314f05253301865b168d70b26ff212813df Mon Sep 17 00:00:00 2001
From: sunyongyue <sunyongyue@bytedance.com>
Date: Thu, 13 Mar 2025 11:00:29 +0800
Subject: [PATCH 2/2] fix: typos

---
 reflect.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reflect.go b/reflect.go
index bd54db96..cbeba959 100644
--- a/reflect.go
+++ b/reflect.go
@@ -58,15 +58,15 @@ func (c *ctx) addEncoder(t reflect2.Type, v ValEncoder) {
 }
 
 func (c *ctx) getDecoder(t reflect2.Type) ValDecoder {
-	encoder, found := c.encoders.Load(t)
+	decoder, found := c.decoders.Load(t)
 	if found {
-		return encoder.(ValDecoder)
+		return decoder.(ValDecoder)
 	}
 	return nil
 }
 
 func (c *ctx) addDecoder(t reflect2.Type, v ValDecoder) {
-	c.encoders.Store(t, v)
+	c.decoders.Store(t, v)
 }
 
 func (b *ctx) caseSensitive() bool {