Skip to content

Commit d76540a

Browse files
committed
mysql: Fix ColumnNumber() panic with nil Resultset
1 parent dc262fe commit d76540a

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

mysql/resultset.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ func (r *Resultset) RowNumber() int {
8787
}
8888

8989
func (r *Resultset) ColumnNumber() int {
90+
if r == nil {
91+
return 0
92+
}
9093
return len(r.Fields)
9194
}
9295

mysql/resultset_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package mysql
2+
3+
import "testing"
4+
5+
func TestColumnNumber(t *testing.T) {
6+
r := Result{}
7+
// Make sure ColumnNumber doesn't panic if ResultSet is nil
8+
// https://github.com/go-mysql-org/go-mysql/issues/964
9+
r.ColumnNumber()
10+
}

0 commit comments

Comments
 (0)