Merge pull request #489 from Projectplace/fix-cancel-race

Fix race in ExecContext

1 files changed, 6 insertions, 2 deletions

diff --git a/sqlite3.go b/sqlite3.go
index a931735..c9edd40 100644
--- a/sqlite3.go
+++ b/sqlite3.go
@@ -1171,9 +1171,13 @@ func (s *SQLiteStmt) exec(ctx context.Context, args []namedValue) (driver.Result
 	defer close(done)
 	go func(db *C.sqlite3) {
 		select {
-		case <-ctx.Done():
-			C.sqlite3_interrupt(db)
 		case <-done:
+		case <-ctx.Done():
+			select {
+			case <-done:
+			default:
+				C.sqlite3_interrupt(db)
+			}
 		}
 	}(s.c.db)