Merge pull request #844 from scottmcarthur/master

Check for null item in BindingList<T>.InsertItem

2 files changed, 11 insertions, 1 deletions

diff --git a/mcs/class/System/System.ComponentModel/BindingList.cs b/mcs/class/System/System.ComponentModel/BindingList.cs
index b64d655efe0..b4c0ce8b69b 100644
--- a/mcs/class/System/System.ComponentModel/BindingList.cs
+++ b/mcs/class/System/System.ComponentModel/BindingList.cs
@@ -242,7 +242,7 @@ namespace System.ComponentModel {
 			if (raise_list_changed_events)
 				OnListChanged (new ListChangedEventArgs (ListChangedType.ItemAdded, index));
 
-			if (type_raises_item_changed_events)
+			if (item != null && type_raises_item_changed_events)
 				(item as INotifyPropertyChanged).PropertyChanged += Item_PropertyChanged;
 		}
 
diff --git a/mcs/class/System/Test/System.ComponentModel/BindingListTest.cs b/mcs/class/System/Test/System.ComponentModel/BindingListTest.cs
index 88be568f429..92a6253db91 100644
--- a/mcs/class/System/Test/System.ComponentModel/BindingListTest.cs
+++ b/mcs/class/System/Test/System.ComponentModel/BindingListTest.cs
@@ -629,6 +629,16 @@ namespace MonoTests.System.ComponentModel
 			Assert.IsTrue (added, "ItemAdded");
 			Assert.IsTrue (changed, "ItemChanged");
 		}
+		
+		[Test] // https://bugzilla.xamarin.com/show_bug.cgi?id=16902
+		public void Bug16902 ()
+		{
+			var list = new BindingList<Item> ();
+			list.Insert (0, null);
+			var count = list.Count;
+			
+			Assert.AreEqual (1, count, "1");
+		}
 	}
 }