fix:(ast) panic when calling SortKeys() on raw node (#522)

bytedance · Sep 6, 2023 · ada8e06 · ada8e06
1 parent 61ca8ba
commit ada8e06
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/ast/encode_test.go b/ast/encode_test.go
@@ -150,6 +150,36 @@ func TestEncodeNode(t *testing.T) {
     }
 }
 
+type SortableNode struct {
+    sorted bool
+	*Node
+}
+
+func (j *SortableNode) UnmarshalJSON(data []byte) (error) {
+    j.Node = new(Node)
+	return j.Node.UnmarshalJSON(data)
+}
+
+func (j *SortableNode) MarshalJSON() ([]byte, error) {
+    if !j.sorted {
+        j.Node.SortKeys(true)
+        j.sorted = true
+    }
+	return j.Node.MarshalJSON()
+}
+
+func TestMarshalSort(t *testing.T) {
+    var data = `{"d":3,"a":{"c":1,"b":2}}`
+    var obj map[string]*SortableNode
+    require.NoError(t, json.Unmarshal([]byte(data), &obj))
+    out, err := json.Marshal(obj)
+    require.NoError(t, err)
+    require.Equal(t, `{"a":{"b":2,"c":1},"d":3}`, string(out))
+    out, err = json.Marshal(obj)
+    require.NoError(t, err)
+    require.Equal(t, `{"a":{"b":2,"c":1},"d":3}`, string(out))
+}
+
 func BenchmarkEncodeRaw_Sonic(b *testing.B) {
     data := _TwitterJson
     root, e := NewSearcher(data).GetByPath()

diff --git a/ast/node.go b/ast/node.go
@@ -61,8 +61,8 @@ type Node struct {
 // UnmarshalJSON is just an adapter to json.Unmarshaler.
 // If you want better performance, use Searcher.GetByPath() directly
 func (self *Node) UnmarshalJSON(data []byte) (err error) {
-    *self, err = NewSearcher(string(data)).GetByPath()
-    return 
+    *self = NewRaw(string(data))
+    return self.Check()
 }
 
 /** Node Type Accessor **/
@@ -857,7 +857,8 @@ func (self *Node) unsafeMap() (*linkedPairs, error) {
 // SortKeys sorts children of a V_OBJECT node in ascending key-order.
 // If recurse is true, it recursively sorts children's children as long as a V_OBJECT node is found.
 func (self *Node) SortKeys(recurse bool) error {
-    if err := self.Check(); err != nil {
+    // check raw node first
+    if err := self.checkRaw(); err != nil {
         return err
     }
     if self.itype() == types.V_OBJECT {

diff --git a/internal/decoder/asm_stubs_amd64_go121.go b/internal/decoder/asm_stubs_amd64_go121.go
@@ -81,7 +81,6 @@ func (self *_Assembler) WriteRecNotAX(i int, ptr obj.Addr, rec obj.Addr, saveDI
     self.Emit("MOVQ", ptr, jit.Ptr(_R11, 0))
     self.Emit("MOVQ", rec, _AX)
     self.Emit("MOVQ", _AX, jit.Ptr(_R11, 8))
-    self.load(_R11)
     if saveAX {
         self.load(_AX, _R11)
     } else {