Skip to content

Harden BindingGroup against re-entrant binding-expression changes #11764

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
wnvko-msft wants to merge 5 commits into
base: main
Choose a base branch
from
+41 −7
Open

Harden BindingGroup against re-entrant binding-expression changes #11764

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2dc99d9
Harden BindingGroup loops against re-entrant binding-expression remov…
wnvko-msft Jul 8, 2026
6a573e3
Potential fix for pull request finding
wnvko-msft Jul 8, 2026
24124af
Guard BindingGroup commit/validate loops against re-entrant collectio…
wnvko-msft Jul 9, 2026
2ca9294
Merge branch 'main' of https://github.com/dotnet/wpf into mvenkov/har…
wnvko-msft Jul 9, 2026
936a06a
Merge branch 'mvenkov/harden-bindinggroup-updatevalues-reentrancy' of…
wnvko-msft Jul 9, 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
48 changes: 41 additions & 7 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Data/BindingGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,18 @@ public void CancelEdit()
}

// update targets
for (int i=_bindingExpressions.Count - 1; i>=0; --i)
for (int i=_bindingExpressions.Count-1; i>=0; --i)
{
_bindingExpressions[i].UpdateTarget();
// a re-entrant callout can shrink the collection - see
// https://github.com/dotnet/wpf/issues/1690
if (i >= _bindingExpressions.Count)
continue;

BindingExpressionBase bindingExpression = _bindingExpressions[i];
if (bindingExpression.BindingGroup != this)
continue;

bindingExpression.UpdateTarget();
}

// also update dependent targets. These are one-way bindings that
Expand Down Expand Up @@ -1133,7 +1142,16 @@ private bool ObtainConvertedProposedValues()
bool result = true;
for (int i=_bindingExpressions.Count-1; i>=0; --i)
{
result = _bindingExpressions[i].ObtainConvertedProposedValue(this) && result;
// a re-entrant callout can shrink the collection - see
// https://github.com/dotnet/wpf/issues/1690
if (i >= _bindingExpressions.Count)
continue;

BindingExpressionBase bindingExpression = _bindingExpressions[i];
if (bindingExpression.BindingGroup != this)
continue;

result = bindingExpression.ObtainConvertedProposedValue(this) && result;
}

return result;
Expand All @@ -1146,7 +1164,16 @@ private bool UpdateValues()

for (int i=_bindingExpressions.Count-1; i>=0; --i)
{
result = _bindingExpressions[i].UpdateSource(this) && result;
// a re-entrant callout can shrink the collection - see
// https://github.com/dotnet/wpf/issues/1690
if (i >= _bindingExpressions.Count)
continue;

BindingExpressionBase bindingExpression = _bindingExpressions[i];
if (bindingExpression.BindingGroup != this)
continue;

result = bindingExpression.UpdateSource(this) && result;
}

if (_proposedValueBindingExpressions != null)
Expand Down Expand Up @@ -1174,10 +1201,17 @@ private bool CheckValidationRules()
// check rules attached to the bindings
for (int i=_bindingExpressions.Count-1; i>=0; --i)
{
if (!_bindingExpressions[i].CheckValidationRules(this, _validationStep))
{
// a re-entrant callout can shrink the collection - see
// https://github.com/dotnet/wpf/issues/1690
if (i >= _bindingExpressions.Count)
continue;

BindingExpressionBase bindingExpression = _bindingExpressions[i];
if (bindingExpression.BindingGroup != this)
continue;

if (!bindingExpression.CheckValidationRules(this, _validationStep))
result = false;
}
}

// include the bindings for proposed values, for the last two steps
Expand Down