Merge pull request #1311 from ydb-platform/fix-nil-pointer-dereference

Fix nil pointer dereference when closing result set.

Author: neyguvj

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fixed nil pointer dereference when closing result set
+
 ## v3.74.4
 * Fixed bug with fail cast of grpc response to `operation.{Response,Status}`
 

internal/query/client.go

@@ -231,15 +231,15 @@ func clientExecute(ctx context.Context,
 	q string, opts ...options.ExecuteOption,
 ) (r query.Result, err error) {
 	err = do(ctx, pool, func(ctx context.Context, s query.Session) (err error) {
-		_, r, err = s.Execute(ctx, q, opts...)
+		_, streamResult, err := s.Execute(ctx, q, opts...)
 		if err != nil {
 			return xerrors.WithStackTrace(err)
 		}
 		defer func() {
-			_ = r.Close(ctx)
+			_ = streamResult.Close(ctx)
 		}()
 
-		r, err = resultToMaterializedResult(ctx, r)
+		r, err = resultToMaterializedResult(ctx, streamResult)
 		if err != nil {
 			return xerrors.WithStackTrace(err)
 		}