fix: check valid first in fallback Unmarshal

bytedance · Feb 14, 2024 · 3413fac · 3413fac
1 parent e47ca10
commit 3413fac
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/compat.go b/compat.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || !go1.16 || go1.22
 // +build !amd64 !go1.16 go1.22
 
 /*
@@ -19,12 +20,13 @@
 package sonic
 
 import (
-    `bytes`
-    `encoding/json`
-    `io`
-    `reflect`
+	"bytes"
+	"encoding/json"
+	"io"
+	"reflect"
 
-    `github.com/bytedance/sonic/option`
+	"github.com/bytedance/sonic/internal/rt"
+	"github.com/bytedance/sonic/option"
 )
 
 type frozenConfig struct {
@@ -85,6 +87,9 @@ func (cfg frozenConfig) UnmarshalFromString(buf string, val interface{}) error {
     if cfg.DisallowUnknownFields {
         dec.DisallowUnknownFields()
     }
+    if !json.Valid(rt.Str2Mem(buf)) {
+        return json.Unmarshal(rt.Str2Mem(buf), val)
+    }
     return dec.Decode(val)
 }