Skip to content

Fix ServerCompositionSimplePen memory leak #19958

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 3 commits into
base: master
Choose a base branch
from
Open

Fix ServerCompositionSimplePen memory leak #19958

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6edfba7
Fix for Issue#16451
aguahombre Oct 31, 2025
23d77a6
Remove the pen from the brush observers without queuing the pen for i…
aguahombre Nov 5, 2025
2385dfd
Merge branch 'master' into Issue16451
aguahombre Nov 5, 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
16 changes: 11 additions & 5 deletions src/Avalonia.Base/Rendering/Composition/Drawing/ServerCompositionSimplePen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
using System;
using Avalonia.Media;
using Avalonia.Media.Immutable;
using Avalonia.Rendering.Composition.Server;
using Avalonia.Rendering.Composition.Transport;

namespace Avalonia.Rendering.Composition.Server;

internal partial class ServerCompositionSimplePen : IPen
{
IDashStyle? IPen.DashStyle => DashStyle;
}

/// <inheritdoc/>
public override void Dispose()
{
// Dispose of the brush resource, this will remove the pen from the brush observers.
// This was causing the pen to be retained in memory by long lived brush resources (e.g. those defined in
// the theme or app resources), hence was causing memory leaks; see Issue #16451
SetValue(ref _brush, null!);
Copy link
Member

@MrJul MrJul Nov 3, 2025

Choose a reason for hiding this comment

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

The property change will cause the pen to be queued for invalidation, which isn't needed since the object is being disposed. I think a better fix would be to call RemoveObserversFromProperty(ref _brush).

Copy link
Contributor Author

@aguahombre aguahombre Nov 5, 2025

Choose a reason for hiding this comment

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

Yes, that makes sense, I'll make the change.
SetValue nulls the brush, so I'll set the brush to null, although it should not be necessary if the pen get GCed.

base.Dispose();
}
}
Loading