fix: Possible null ref when initialiazing BindableImmutableList

unoplatform · Nov 17, 2022 · d4f072e · d4f072e
1 parent 9e77ddf
commit d4f072e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Uno.Extensions.Reactive/Presentation/Bindings/BindableEnumerable.cs b/src/Uno.Extensions.Reactive/Presentation/Bindings/BindableEnumerable.cs
@@ -33,7 +33,7 @@ public abstract class BindableEnumerable<TCollection, TItem, TBindableItem> : Bi
 	private readonly BindablePropertyInfo<TCollection> _listProperty;
 	private readonly Func<BindablePropertyInfo<TItem>, TBindableItem> _bindableFactory;
 
-	private readonly Visitor _visitor;
+	private Visitor? _visitor;
 
 	/// <summary>
 	/// Creates a new instance
@@ -47,7 +47,6 @@ private protected BindableEnumerable(
 	{
 		_listProperty = property;
 		_bindableFactory = bindableFactory;
-		_visitor = new Visitor(this);
 	}
 
 	private protected abstract CollectionChangeSet<TItem> GetChanges(TCollection previous, TCollection current);
@@ -58,7 +57,7 @@ private protected override void UpdateSubProperties(TCollection previous, TColle
 	{
 		var collectionChanges = (changes as CollectionChangeSet<TItem> ?? GetChanges(previous, current));
 		base.UpdateSubProperties(previous, current, collectionChanges);
-		collectionChanges.Visit(_visitor);
+		collectionChanges.Visit(_visitor ??= new(this));
 	}
 
 	#region IList (read-only)