Fix #2986 - Make ModelMetadata getters null-safe

aspnet · Aug 19, 2015 · 91147d4 · 91147d4
1 parent 485e6e5
commit 91147d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
@@ -122,7 +122,8 @@ protected virtual DefaultMetadataDetails[] CreatePropertyDetails([NotNull] Model
                 var propertyEntry = new DefaultMetadataDetails(propertyKey, attributes);
                 if (propertyHelper.Property.CanRead && propertyHelper.Property.GetMethod?.IsPublic == true)
                 {
-                    propertyEntry.PropertyGetter = propertyHelper.ValueGetter;
+                    var getter = PropertyHelper.MakeNullSafeFastPropertyGetter(propertyHelper.Property);
+                    propertyEntry.PropertyGetter = getter;
                 }
 
                 if (propertyHelper.Property.CanWrite &&

diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/MutableObjectModelBinder.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/MutableObjectModelBinder.cs
@@ -287,10 +287,7 @@ private static bool CanUpdateReadOnlyProperty(Type propertyType)
                 // instances or overwrite inner properties that are not bound. No need for this with simple values
                 // because they will be overwritten if binding succeeds. Arrays are never reused because they cannot
                 // be resized.
-                //
-                // ModelMetadata.PropertyGetter is not null safe; use it only if Model is non-null.
-                if (bindingContext.Model != null &&
-                    propertyMetadata.PropertyGetter != null &&
+                if (propertyMetadata.PropertyGetter != null &&
                     propertyMetadata.IsComplexType &&
                     !propertyMetadata.ModelType.IsArray)
                 {