Merge pull request jmoiron#268 from classmarkets/scan-any-panic

scanAny: add nil check
andysgithub · Dec 9, 2016 · cac998c · cac998c
2 parents f9b4c7a + 590692e
commit cac998c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sqlx.go b/sqlx.go
@@ -717,6 +717,10 @@ func (r *Row) scanAny(dest interface{}, structOnly bool) error {
 	if r.err != nil {
 		return r.err
 	}
+	if r.rows == nil {
+		r.err = sql.ErrNoRows
+		return r.err
+	}
 	defer r.rows.Close()
 
 	v := reflect.ValueOf(dest)