Skip to content

Only Dispose Non-Null Handles in ETWTraceEventSource #2291

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
brianrob merged 2 commits into from
Aug 29, 2025
Merged

Only Dispose Non-Null Handles in ETWTraceEventSource #2291

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f5ed83
Only dispose non-null handles in ETWTraceEventSource.
brianrob Aug 29, 2025
e3ddb58
Also check if the handle is valid before disposing it.
brianrob Aug 29, 2025
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
2 changes: 1 addition & 1 deletion src/TraceEvent/ETWTraceEventSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ protected override void Dispose(bool disposing)
{
foreach (TraceEventNativeMethods.SafeTraceHandle handle in handles)
{
handle.Dispose();
handle?.Dispose();

@mconnew mconnew Aug 29, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should you also check if the handle is valid? Is this a standard SafeHandle? If so, calling Dispose on an invalid handle can throw.

@brianrob brianrob Aug 29, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's a good idea. Updated.

}

handles = null;
Expand Down