Skip to content

Commit 10d81be

Browse files
Roman Golovadwski
authored andcommitted
Fix nil pointer dereference when closing result set.
1 parent 4393861 commit 10d81be

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* Added warm-up and asynchronous item handling in internal/pool
1+
* Fixed nil pointer dereference when closing result set
22

33
## v3.74.4
44
* Fixed bug with fail cast of grpc response to `operation.{Response,Status}`

internal/query/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,15 @@ func clientExecute(ctx context.Context,
231231
q string, opts ...options.ExecuteOption,
232232
) (r query.Result, err error) {
233233
err = do(ctx, pool, func(ctx context.Context, s query.Session) (err error) {
234-
_, r, err = s.Execute(ctx, q, opts...)
234+
_, streamResult, err := s.Execute(ctx, q, opts...)
235235
if err != nil {
236236
return xerrors.WithStackTrace(err)
237237
}
238238
defer func() {
239-
_ = r.Close(ctx)
239+
_ = streamResult.Close(ctx)
240240
}()
241241

242-
r, err = resultToMaterializedResult(ctx, r)
242+
r, err = resultToMaterializedResult(ctx, streamResult)
243243
if err != nil {
244244
return xerrors.WithStackTrace(err)
245245
}

0 commit comments

Comments
 (0)