Merge pull request #345 from joeshaw/backup-finalizer-fix

fix double free in SQLiteBackup.Close() on error

1 files changed, 7 insertions, 2 deletions

diff --git a/backup.go b/backup.go
index 4c1e38c..05f8038 100644
--- a/backup.go
+++ b/backup.go
@@ -65,10 +65,15 @@ func (b *SQLiteBackup) Finish() error {
 
 func (b *SQLiteBackup) Close() error {
 	ret := C.sqlite3_backup_finish(b.b)
+
+	// sqlite3_backup_finish() never fails, it just returns the
+	// error code from previous operations, so clean up before
+	// checking and returning an error
+	b.b = nil
+	runtime.SetFinalizer(b, nil)
+
 	if ret != 0 {
 		return Error{Code: ErrNo(ret)}
 	}
-	b.b = nil
-	runtime.SetFinalizer(b, nil)
 	return nil
 }