Skip to content

Commit 75d8c60

Browse files
authored
Merge pull request #1403 from dxbjavid/bind-text64-length
bind via sqlite3_bind_text64/blob64 to avoid 32-bit length truncation
2 parents b3b5216 + d1ab49c commit 75d8c60

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

sqlite3.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ _sqlite3_open_v2(const char *filename, sqlite3 **ppDb, int flags, const char *zV
6969
}
7070
7171
static int
72-
_sqlite3_bind_text(sqlite3_stmt *stmt, int n, char *p, int np) {
73-
return sqlite3_bind_text(stmt, n, p, np, SQLITE_TRANSIENT);
72+
_sqlite3_bind_text(sqlite3_stmt *stmt, int n, char *p, sqlite3_uint64 np) {
73+
return sqlite3_bind_text64(stmt, n, p, np, SQLITE_TRANSIENT, SQLITE_UTF8);
7474
}
7575
7676
static int
77-
_sqlite3_bind_blob(sqlite3_stmt *stmt, int n, void *p, int np) {
78-
return sqlite3_bind_blob(stmt, n, p, np, SQLITE_TRANSIENT);
77+
_sqlite3_bind_blob(sqlite3_stmt *stmt, int n, void *p, sqlite3_uint64 np) {
78+
return sqlite3_bind_blob64(stmt, n, p, np, SQLITE_TRANSIENT);
7979
}
8080
8181
typedef struct {
@@ -2180,9 +2180,9 @@ var placeHolder = []byte{0}
21802180

21812181
func bindText(s *C.sqlite3_stmt, n C.int, v string) C.int {
21822182
if len(v) == 0 {
2183-
return C._sqlite3_bind_text(s, n, (*C.char)(unsafe.Pointer(&placeHolder[0])), C.int(0))
2183+
return C._sqlite3_bind_text(s, n, (*C.char)(unsafe.Pointer(&placeHolder[0])), C.sqlite3_uint64(0))
21842184
}
2185-
return C._sqlite3_bind_text(s, n, (*C.char)(unsafe.Pointer(unsafe.StringData(v))), C.int(len(v)))
2185+
return C._sqlite3_bind_text(s, n, (*C.char)(unsafe.Pointer(unsafe.StringData(v))), C.sqlite3_uint64(len(v)))
21862186
}
21872187

21882188
func bindValue(s *C.sqlite3_stmt, n C.int, value driver.Value) C.int {
@@ -2208,14 +2208,14 @@ func bindValue(s *C.sqlite3_stmt, n C.int, value driver.Value) C.int {
22082208
if ln == 0 {
22092209
v = placeHolder
22102210
}
2211-
return C._sqlite3_bind_blob(s, n, unsafe.Pointer(&v[0]), C.int(ln))
2211+
return C._sqlite3_bind_blob(s, n, unsafe.Pointer(&v[0]), C.sqlite3_uint64(ln))
22122212
case time.Time:
22132213
var buf [64]byte
22142214
b := v.AppendFormat(buf[:0], SQLiteTimestampFormats[0])
22152215
if len(b) == 0 {
2216-
return C._sqlite3_bind_text(s, n, (*C.char)(unsafe.Pointer(&placeHolder[0])), C.int(0))
2216+
return C._sqlite3_bind_text(s, n, (*C.char)(unsafe.Pointer(&placeHolder[0])), C.sqlite3_uint64(0))
22172217
}
2218-
return C._sqlite3_bind_text(s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b)))
2218+
return C._sqlite3_bind_text(s, n, (*C.char)(unsafe.Pointer(&b[0])), C.sqlite3_uint64(len(b)))
22192219
default:
22202220
return C.SQLITE_MISUSE
22212221
}

0 commit comments

Comments
 (0)