Skip to content

[AAP] Rugerize waf encoder disposal #7863

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

[AAP] Rugerize waf encoder disposal #7863

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
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/AppSec/Security.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ private string GetHtmlResponse()
public void Dispose()
{
_waf?.Dispose();
Encoder.Pool.Dispose();
Encoder.Dispose();
_activeAddressesLocker.Dispose();
}

Expand Down
16 changes: 16 additions & 0 deletions tracer/src/Datadog.Trace/AppSec/WafEncoding/Encoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,22 @@ internal static UnmanagedMemoryPool Pool
}
}

internal static void Dispose()
{
try
{
if (_pool is { IsDisposed: false })
{
_pool.Dispose();
_pool = null;
}
}
catch (Exception ex)
{
Log.Debug(ex, "WafEncoder Crashed on shutdown.");
}
}

/// <summary>
/// For testing purposes
/// </summary>
Expand Down
Loading