diff options
| author | mattn <mattn.jp@gmail.com> | 2017-06-21 10:05:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 10:05:20 +0900 |
| commit | afe454f6220b3972691678af2c5579781563183f (patch) | |
| tree | 31af7258126a45568ec60e5ee40fe8046fd85431 /sqlite3.go | |
| parent | Merge pull request #427 from otoolep/conn_stmt_race (diff) | |
| parent | Fix for cgo panic, issue #428: https://github.com/mattn/go-sqlite3/issues/428 (diff) | |
| download | golite-afe454f6220b3972691678af2c5579781563183f.tar.gz golite-afe454f6220b3972691678af2c5579781563183f.tar.xz | |
Merge pull request #429 from emakeev/cgo_panic_fix
Fix for cgo panic, issue #428: https://github.com/mattn/go-sqlite3/is…
Diffstat (limited to 'sqlite3.go')
| -rw-r--r-- | sqlite3.go | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -747,7 +747,7 @@ type bindArg struct { v driver.Value } -var placeHolder byte = 0 +var placeHolder = []byte{0} func (s *SQLiteStmt) bind(args []namedValue) error { rv := C.sqlite3_reset(s.s) @@ -770,7 +770,7 @@ func (s *SQLiteStmt) bind(args []namedValue) error { rv = C.sqlite3_bind_null(s.s, n) case string: if len(v) == 0 { - rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&placeHolder)), C.int(0)) + rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&placeHolder[0])), C.int(0)) } else { b := []byte(v) rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b))) @@ -786,13 +786,10 @@ func (s *SQLiteStmt) bind(args []namedValue) error { case float64: rv = C.sqlite3_bind_double(s.s, n, C.double(v)) case []byte: - var ptr *byte if len(v) == 0 { - ptr = &placeHolder - } else { - ptr = &v[0] + v = placeHolder } - rv = C._sqlite3_bind_blob(s.s, n, unsafe.Pointer(ptr), C.int(len(v))) + rv = C._sqlite3_bind_blob(s.s, n, unsafe.Pointer(&v[0]), C.int(len(v))) case time.Time: b := []byte(v.Format(SQLiteTimestampFormats[0])) rv = C._sqlite3_bind_text(s.s, n, (*C.char)(unsafe.Pointer(&b[0])), C.int(len(b))) |