Skip to content

Commit 05e9a7e

Browse files
GODRIVER-3434 Fix memory deallocaiton issue
1 parent 930d177 commit 05e9a7e

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

mongo/client.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"go.mongodb.org/mongo-driver/v2/internal/httputil"
1919
"go.mongodb.org/mongo-driver/v2/internal/logger"
2020
"go.mongodb.org/mongo-driver/v2/internal/mongoutil"
21+
"go.mongodb.org/mongo-driver/v2/internal/ptrutil"
2122
"go.mongodb.org/mongo-driver/v2/internal/serverselector"
2223
"go.mongodb.org/mongo-driver/v2/internal/uuid"
2324
"go.mongodb.org/mongo-driver/v2/mongo/options"
@@ -479,6 +480,7 @@ func (c *Client) configureAutoEncryption(args *options.ClientOptions) error {
479480
if err := c.configureKeyVaultClientFLE(args); err != nil {
480481
return err
481482
}
483+
482484
if err := c.configureMetadataClientFLE(args); err != nil {
483485
return err
484486
}
@@ -506,12 +508,13 @@ func (c *Client) getOrCreateInternalClient(args *options.ClientOptions) (*Client
506508
return c.internalClientFLE, nil
507509
}
508510

509-
internalClientOpts := options.MergeClientOptions(args)
510-
internalClientOpts.AutoEncryptionOptions = nil
511-
internalClientOpts.SetMinPoolSize(0)
511+
argsCopy := *args
512+
513+
argsCopy.AutoEncryptionOptions = nil
514+
argsCopy.MinPoolSize = ptrutil.Ptr[uint64](0)
512515

513516
var err error
514-
c.internalClientFLE, err = newClient(internalClientOpts)
517+
c.internalClientFLE, err = newClient(&argsCopy)
515518

516519
return c.internalClientFLE, err
517520
}

0 commit comments

Comments
 (0)