re
/
go-sqlite3
forked from mirror/go-sqlite3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix idxStr freeing issue (#898) 

uses snippet suggested by @rittneje https://github.com/mattn/go-sqlite3/issues/897#issuecomment-752162125
This commit is contained in:
Patrick DeVivo 2021-10-25 17:13:24 +02:00 committed by GitHub
parent 98d34f9dc5
commit 2b780b4a7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sqlite3_opt_vtable.go
View File

@ -472,10 +472,21 @@ func goVBestIndex(pVTab unsafe.Pointer, icp unsafe.Pointer) *C.char {
} }
info.idxNum = C.int(res.IdxNum) info.idxNum = C.int(res.IdxNum)
idxStr := C.CString(res.IdxStr) info.idxStr = (*C.char)(C.sqlite3_malloc(C.int(len(res.IdxStr) + 1)))
defer C.free(unsafe.Pointer(idxStr)) if info.idxStr == nil {
info.idxStr = idxStr // C.malloc and C.CString ordinarily do this for you. See https://golang.org/cmd/cgo/
info.needToFreeIdxStr = C.int(0) panic("out of memory")
}
info.needToFreeIdxStr = C.int(1)
idxStr := *(*[]byte)(unsafe.Pointer(&reflect.SliceHeader{
Data: uintptr(unsafe.Pointer(info.idxStr)),
Len: len(res.IdxStr) + 1,
Cap: len(res.IdxStr) + 1,
}))
copy(idxStr, res.IdxStr)
idxStr[len(idxStr)-1] = 0 // null-terminated string
if res.AlreadyOrdered { if res.AlreadyOrdered {
info.orderByConsumed = C.int(1) info.orderByConsumed = C.int(1)
} }