Skip to content

Commit

Permalink
Merge pull request #429 from emakeev/cgo_panic_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mattn committed Jun 21, 2017
2 parents a819994 + ef9f773 commit afe454f
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions sqlite3.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)))
Expand All @@ -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)))
Expand Down

0 comments on commit afe454f

Please sign in to comment.