Merge pull request #373 from xssnick/dbg-rldp

TL Uintptr arithmetics changed to unsafe.Pointer with runtime keep-alive for safety

Author: xssnick

README.md

@@ -4,7 +4,7 @@
 
 [![Based on TON][ton-svg]][ton]
 [![Telegram Channel][tgc-svg]][tg-channel]
-![Coverage](https://img.shields.io/badge/Coverage-70.1%25-brightgreen)
+![Coverage](https://img.shields.io/badge/Coverage-70.2%25-brightgreen)
 
 Golang library for interacting with TON blockchain.
 

tl/precompile.go

@@ -8,6 +8,7 @@ import (
 	"github.com/xssnick/tonutils-go/tvm/cell"
 	"net"
 	"reflect"
+	"runtime"
 	"strconv"
 	"strings"
 	"unsafe"
@@ -398,7 +399,7 @@ func serializePrecompiled(ptr unsafe.Pointer, t *structInfo, boxed bool, buf *by
 		return nil
 	}
 
-	if err := executeSerialize(buf, uintptr(ptr), t); err != nil {
+	if err := executeSerialize(buf, ptr, t); err != nil {
 		buf.Truncate(bufStart)
 		return fmt.Errorf("failed to serialize %s type: %w", t.tp.String(), err)
 	}
@@ -482,18 +483,18 @@ func parsePrecompiled(ptr unsafe.Pointer, t *structInfo, boxed bool, buf []byte,
 		return buf, nil
 	}
 
-	if buf, err = executeParse(buf, uintptr(ptr), t, noCopy); err != nil {
+	if buf, err = executeParse(buf, ptr, t, noCopy); err != nil {
 		return nil, fmt.Errorf("failed to parse %s type: %w", t.tp.String(), err)
 	}
 	return buf, nil
 }
 
-func executeParse(buf []byte, startPtr uintptr, si *structInfo, noCopy bool) ([]byte, error) {
+func executeParse(buf []byte, base unsafe.Pointer, si *structInfo, noCopy bool) ([]byte, error) {
 	if !si.finalized {
 		return nil, fmt.Errorf("TL struct %s is not registered", si.tp.String())
 	}
 
-	// TODO: noCopy mode
+	defer runtime.KeepAlive((*byte)(base))
 
 	var flags uint32
 	for _, field := range si.fields {
@@ -502,8 +503,7 @@ func executeParse(buf []byte, startPtr uintptr, si *structInfo, noCopy bool) ([]
 			continue
 		}
 
-		//goland:noinspection GoVetUnsafePointer
-		ptr := unsafe.Pointer(startPtr + field.offset)
+		ptr := unsafe.Add(base, field.offset)
 
 		var err error
 		switch t := field.typ; t {
@@ -756,43 +756,45 @@ func executeParse(buf []byte, startPtr uintptr, si *structInfo, noCopy bool) ([]
 			sl := reflect.MakeSlice(field.structInfo.tp, ln, ln)
 
 			sz := field.structInfo.tp.Elem().Size()
-			ePtr := sl.Pointer()
+			ePtr := unsafe.Pointer(sl.Pointer())
 
 			for x := 0; x < ln; x++ {
 				buf, err = executeParse(buf, ePtr, field.structInfo, noCopy)
 				if err != nil {
 					return nil, fmt.Errorf("failed to parse %s type, vector element %d: %w", si.tp.String(), x, err)
 				}
 
-				ePtr += sz
+				ePtr = unsafe.Add(ePtr, sz)
 			}
 
 			*(*reflect.SliceHeader)(ptr) = reflect.SliceHeader{
 				Data: sl.Pointer(),
 				Len:  ln,
 				Cap:  ln,
 			}
+			runtime.KeepAlive(sl)
 		default:
 			return nil, fmt.Errorf("unknown type %d for field %s", t, field.String())
 		}
 	}
 	return buf, nil
 }
 
-func executeSerialize(buf *bytes.Buffer, startPtr uintptr, si *structInfo) error {
+func executeSerialize(buf *bytes.Buffer, base unsafe.Pointer, si *structInfo) error {
 	if !si.finalized {
 		return fmt.Errorf("TL struct %s is not registered", si.tp.String())
 	}
 
+	defer runtime.KeepAlive((*byte)(base))
+
 	var flags uint32
 	for _, field := range si.fields {
 		if field.hasFlags && (1<<field.flag)&flags == 0 {
 			// skip serialization if flag is not set
 			continue
 		}
 
-		//goland:noinspection GoVetUnsafePointer
-		ptr := unsafe.Pointer(startPtr + field.offset)
+		ptr := unsafe.Add(base, field.offset)
 
 		switch t := field.typ; t {
 		case _ExecuteTypeFlags:
@@ -1018,13 +1020,13 @@ func executeSerialize(buf *bytes.Buffer, startPtr uintptr, si *structInfo) error
 			buf.Write(tmp)
 
 			sz := field.structInfo.tp.Elem().Size()
-			ePtr := hdr.Data
+			ePtr := unsafe.Pointer(hdr.Data)
 
 			for x := 0; x < ln; x++ {
 				if err := executeSerialize(buf, ePtr, field.structInfo); err != nil {
 					return fmt.Errorf("failed to serialize %s type, vector element %d: %w", si.tp.String(), x, err)
 				}
-				ePtr += sz
+				ePtr = unsafe.Add(ePtr, sz)
 			}
 		default:
 			return fmt.Errorf("unknown type %d for field %s", t, field.String())