Merge pull request #262 from go-kivik/close-v3

Ensure a multiQueriesRows object closes all resources
go-kivik · Nov 19, 2020 · 76772d6 · 76772d6
2 parents a499a4c + ed13e61
commit 76772d6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/rows.go b/rows.go
@@ -259,13 +259,17 @@ func (r *multiQueriesRows) Close() error {
 	if atomic.AddInt32(&r.closed, 1) > 1 {
 		return nil
 	}
+	r.dec = nil
+	if r.rows != nil {
+		defer r.rows.Close() // nolint:errcheck
+	}
+	defer r.r.Close() // nolint:errcheck
 	if _, err := ioutil.ReadAll(r.r); err != nil {
 		return err
 	}
 	if err := r.r.Close(); err != nil {
 		return err
 	}
-	r.dec = nil
 	if r.rows == nil {
 		return nil
 	}