Skip to content

fix: dispose enumerator in CsvWriter.WriteRecordsAsync #2297

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
merged 1 commit into from
Jun 1, 2025
Merged

fix: dispose enumerator in CsvWriter.WriteRecordsAsync #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/CsvHelper.Website/input/change-log/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

### 33.0.2

#### Bug Fixes

- Dispose of IAsyncDisposable enumerators in CsvWriter

### 33.0.1

#### Bug Fixes
Expand Down
25 changes: 19 additions & 6 deletions src/CsvHelper/CsvWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,13 @@ public virtual async Task WriteRecordsAsync(IEnumerable records, CancellationTok
}
finally
{
if (enumerator is IDisposable en)
if (enumerator is IAsyncDisposable asyncDisposable)
{
en.Dispose();
await asyncDisposable.DisposeAsync().ConfigureAwait(false);
}
else if (enumerator is IDisposable disposable)
{
disposable.Dispose();
}
}
}
Expand Down Expand Up @@ -566,10 +570,15 @@ public virtual async Task WriteRecordsAsync<T>(IEnumerable<T> records, Cancellat
}
finally
{
if (enumerator is IDisposable en)
if (enumerator is IAsyncDisposable asyncDisposable)
{
en.Dispose();
await asyncDisposable.DisposeAsync().ConfigureAwait(false);
}
else if (enumerator is IDisposable disposable)
{
disposable.Dispose();
}

}
}

Expand Down Expand Up @@ -626,9 +635,13 @@ public virtual async Task WriteRecordsAsync<T>(IAsyncEnumerable<T> records, Canc
}
finally
{
if (enumerator is IDisposable en)
if (enumerator is IAsyncDisposable asyncDisposable)
{
en.Dispose();
await asyncDisposable.DisposeAsync().ConfigureAwait(false);
}
else if (enumerator is IDisposable disposable)
{
disposable.Dispose();
}
}
}
Expand Down