Merge pull request #58210 from RaduBerinde/fetcher-crash

release-20.2: sql: safeguard against nil fetcher in GetBytesRead
cockroachdb · Dec 24, 2020 · 49115ed · 49115ed
2 parents e90d2bf + d3d4c03
commit 49115ed
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/sql/row/kv_fetcher.go b/pkg/sql/row/kv_fetcher.go
@@ -61,6 +61,9 @@ func newKVFetcher(batchFetcher kvBatchFetcher) *KVFetcher {
 
 // GetBytesRead returns the number of bytes read by this fetcher.
 func (f *KVFetcher) GetBytesRead() int64 {
+	if f == nil {
+		return 0
+	}
 	return f.bytesRead
 }