Merge pull request #406 from zombiezen/fixleak

mattn · web-flow · commit c935ccca28b8 · 2017-04-02T23:10:16.000+09:00
Avoid leaking db if setting busy timeout fails
diff --git a/sqlite3.go b/sqlite3.go
@@ -609,6 +609,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {
 
 	rv = C.sqlite3_busy_timeout(db, C.int(busyTimeout))
 	if rv != C.SQLITE_OK {
+		C.sqlite3_close_v2(db)
 		return nil, Error{Code: ErrNo(rv)}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -609,6 +609,7 @@ func (d *SQLiteDriver) Open(dsn string) (driver.Conn, error) {`
`609`	`609`
`610`	`610`	`rv = C.sqlite3_busy_timeout(db, C.int(busyTimeout))`
`611`	`611`	`if rv != C.SQLITE_OK {`
	`612`	`+ C.sqlite3_close_v2(db)`
`612`	`613`	`return nil, Error{Code: ErrNo(rv)}`
`613`	`614`	`}`
`614`	`615`