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

Merge pull request #644 from akalin/fix-pointer-conversion 

Clean up blob to byte slice conversion
This commit is contained in:
mattn 2018-11-22 01:47:23 +09:00 committed by GitHub
parent 0a64ab220b 2364b288cc
commit c880439687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sqlite3.go
View File

@ -2027,13 +2027,8 @@ func (rc *SQLiteRows) Next(dest []driver.Value) error {
dest[i] = nil dest[i] = nil
continue continue
} }
n := int(C.sqlite3_column_bytes(rc.s.s, C.int(i))) n := C.sqlite3_column_bytes(rc.s.s, C.int(i))
switch dest[i].(type) { dest[i] = C.GoBytes(p, n)
default:
slice := make([]byte, n)
copy(slice[:], (*[1 << 30]byte)(p)[0:n])
dest[i] = slice
}
case C.SQLITE_NULL: case C.SQLITE_NULL:
dest[i] = nil dest[i] = nil
case C.SQLITE_TEXT: case C.SQLITE_TEXT: