fix:(encoder) insufficient buffer size check for OP_i32

bytedance · Jul 28, 2022 · 00942b0 · 00942b0
1 parent 2eae594
commit 00942b0
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 15 deletions.
diff --git a/encoder/assembler_amd64_go116.go b/encoder/assembler_amd64_go116.go
@@ -819,7 +819,7 @@ func (self *_Assembler) _asm_OP_i16(_ *_Instr) {
 }
 
 func (self *_Assembler) _asm_OP_i32(_ *_Instr) {
-    self.store_int(11, _F_i64toa, "MOVLQSX")
+    self.store_int(17, _F_i64toa, "MOVLQSX")
 }
 
 func (self *_Assembler) _asm_OP_i64(_ *_Instr) {
@@ -835,7 +835,7 @@ func (self *_Assembler) _asm_OP_u16(_ *_Instr) {
 }
 
 func (self *_Assembler) _asm_OP_u32(_ *_Instr) {
-    self.store_int(10, _F_u64toa, "MOVLQZX")
+    self.store_int(16, _F_u64toa, "MOVLQZX")
 }
 
 func (self *_Assembler) _asm_OP_u64(_ *_Instr) {

diff --git a/encoder/assembler_amd64_go117.go b/encoder/assembler_amd64_go117.go
@@ -832,7 +832,7 @@ func (self *_Assembler) _asm_OP_i16(_ *_Instr) {
 }
 
 func (self *_Assembler) _asm_OP_i32(_ *_Instr) {
-    self.store_int(11, _F_i64toa, "MOVLQSX")
+    self.store_int(17, _F_i64toa, "MOVLQSX")
 }
 
 func (self *_Assembler) _asm_OP_i64(_ *_Instr) {
@@ -848,7 +848,7 @@ func (self *_Assembler) _asm_OP_u16(_ *_Instr) {
 }
 
 func (self *_Assembler) _asm_OP_u32(_ *_Instr) {
-    self.store_int(10, _F_u64toa, "MOVLQZX")
+    self.store_int(16, _F_u64toa, "MOVLQZX")
 }
 
 func (self *_Assembler) _asm_OP_u64(_ *_Instr) {

diff --git a/encoder/assembler_test.go b/encoder/assembler_test.go
@@ -17,20 +17,40 @@
 package encoder
 
 import (
-	"encoding/hex"
-	"encoding/json"
-	"math"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-	"unsafe"
+    `encoding/hex`
+    `encoding/json`
+    `math`
+    `reflect`
+    `runtime`
+    `strings`
+    `testing`
+    `unsafe`
 
-	"github.com/bytedance/sonic/internal/rt"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/stretchr/testify/assert"
+    `github.com/bytedance/sonic/internal/rt`
+    `github.com/davecgh/go-spew/spew`
+    `github.com/stretchr/testify/assert`
 )
 
+func TestEncoderMemoryCorruption(t *testing.T) {
+    println("TestEncoderMemoryCorruption")
+    var m = map[string]interface{}{
+        "1": map[string]interface{} {
+            `"`+strings.Repeat("a", _MaxBuffer - 38)+`"`: "b",
+            "1": map[string]int32{
+                "b": 1658219785,
+            },
+        },
+    }
+    out, err := Encode(m, SortMapKeys)
+    if err != nil {
+        t.Fatal(err)
+    }
+    println(len(out))
+    if err := json.Unmarshal(out, &m); err != nil {
+        t.Fatal(err)
+    }
+}
+
 func TestAssembler_CompileAndLoad(t *testing.T) {
     p, err := newCompiler().compile(reflect.TypeOf((*bool)(nil)))
     assert.Nil(t, err)

diff --git a/encoder/encoder.go b/encoder/encoder.go
@@ -170,6 +170,8 @@ func Encode(val interface{}, opts Options) ([]byte, error) {
 // a new one.
 func EncodeInto(buf *[]byte, val interface{}, opts Options) error {
     stk := newStack()
+    println("buf:", uintptr(*(*unsafe.Pointer)(unsafe.Pointer(buf))))
+    println("stk:", uintptr(unsafe.Pointer(stk)))
     efv := rt.UnpackEface(val)
     err := encodeTypedPointer(buf, efv.Type, &efv.Value, stk, uint64(opts))