From 1643a36260cbc5bcc6e4abab6489325b64c57e7a Mon Sep 17 00:00:00 2001
From: Jinzhu <wosmvp@gmail.com>
Date: Fri, 10 Mar 2023 10:48:14 +0800
Subject: [PATCH] Fix possible concurrency problem for serializer

---
 schema/field.go | 13 ++++++++++---
 tests/go.mod    |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/schema/field.go b/schema/field.go
index 59151878..00beb067 100644
--- a/schema/field.go
+++ b/schema/field.go
@@ -916,6 +916,8 @@ func (field *Field) setupValuerAndSetter() {
 			sameElemType = field.FieldType == reflect.ValueOf(field.Serializer).Type().Elem()
 		}
 
+		serializerValue := reflect.Indirect(reflect.ValueOf(field.Serializer))
+		serializerType := serializerValue.Type()
 		field.Set = func(ctx context.Context, value reflect.Value, v interface{}) (err error) {
 			if s, ok := v.(*serializer); ok {
 				if s.fieldValue != nil {
@@ -923,11 +925,12 @@ func (field *Field) setupValuerAndSetter() {
 				} else if err = s.Serializer.Scan(ctx, field, value, s.value); err == nil {
 					if sameElemType {
 						field.ReflectValueOf(ctx, value).Set(reflect.ValueOf(s.Serializer).Elem())
-						s.Serializer = reflect.New(reflect.Indirect(reflect.ValueOf(field.Serializer)).Type()).Interface().(SerializerInterface)
 					} else if sameType {
 						field.ReflectValueOf(ctx, value).Set(reflect.ValueOf(s.Serializer))
-						s.Serializer = reflect.New(reflect.Indirect(reflect.ValueOf(field.Serializer)).Type()).Interface().(SerializerInterface)
 					}
+					si := reflect.New(serializerType)
+					si.Elem().Set(serializerValue)
+					s.Serializer = si.Interface().(SerializerInterface)
 				}
 			} else {
 				err = oldFieldSetter(ctx, value, v)
@@ -939,11 +942,15 @@ func (field *Field) setupValuerAndSetter() {
 
 func (field *Field) setupNewValuePool() {
 	if field.Serializer != nil {
+		serializerValue := reflect.Indirect(reflect.ValueOf(field.Serializer))
+		serializerType := serializerValue.Type()
 		field.NewValuePool = &sync.Pool{
 			New: func() interface{} {
+				si := reflect.New(serializerType)
+				si.Elem().Set(serializerValue)
 				return &serializer{
 					Field:      field,
-					Serializer: field.Serializer,
+					Serializer: si.Interface().(SerializerInterface),
 				}
 			},
 		}
diff --git a/tests/go.mod b/tests/go.mod
index b2d5ca97..e970c9f5 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -9,11 +9,12 @@ require (
 	github.com/lib/pq v1.10.7
 	github.com/mattn/go-sqlite3 v1.14.16 // indirect
 	github.com/microsoft/go-mssqldb v0.20.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
 	gorm.io/driver/mysql v1.4.7
 	gorm.io/driver/postgres v1.4.8
 	gorm.io/driver/sqlite v1.4.4
 	gorm.io/driver/sqlserver v1.4.2
-	gorm.io/gorm v1.24.5
+	gorm.io/gorm v1.24.6
 )
 
 replace gorm.io/gorm => ../