Skip to content

Clear parameters when tearing down a command #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgravell merged 2 commits into from
Aug 20, 2026
Merged

Clear parameters when tearing down a command #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecb63a3
Clear parameters when tearing down a command
mgravell Aug 18, 2026
da3c7da
Also clear parameters in the state Dispose paths
mgravell Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Dapper.AOT/Internal/AsyncCommandState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ public virtual ValueTask DisposeAsync()

if (cmd is not null)
{
// match vanilla's teardown: release caller-supplied parameter objects
cmd.Parameters.Clear();
if (conn is not null && (_flags & FLAG_CLOSE_CONNECTION) != 0)
{
// need to close the connection and dispose the command
Expand Down Expand Up @@ -178,7 +180,12 @@ public virtual void Dispose()
{
var cmd = Command;
Command = null;
cmd?.Dispose();
if (cmd is not null)
{
// match vanilla's teardown: release caller-supplied parameter objects
cmd.Parameters.Clear();
cmd.Dispose();
}

var conn = connection;
connection = null;
Expand Down
7 changes: 6 additions & 1 deletion src/Dapper.AOT/Internal/SyncCommandState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ public void Dispose()
{
var cmd = Command;
Command = null;
cmd?.Dispose();
if (cmd is not null)
{
// match vanilla's teardown: release caller-supplied parameter objects
cmd.Parameters.Clear();
cmd.Dispose();
}

var conn = connection;
connection = null;
Expand Down
9 changes: 8 additions & 1 deletion src/Dapper.AOT/UnifiedCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,14 @@ private DbCommand UnsafeWithCommandForParameters()

internal void Cleanup()
{
dbCommand?.Dispose();
if (dbCommand is not null)
{
// match vanilla Dapper's teardown: a parameter object the caller supplied
// (ICustomQueryParameter, DynamicParameters.Add(DbParameter), etc) must not
// stay owned by a dead command's collection, or it cannot be reused
dbCommand.Parameters.Clear();
dbCommand.Dispose();
}
#if NET6_0_OR_GREATER
batch?.Dispose();
#endif
Expand Down
Loading