From 0e244237c80ec04fafa8c6cf86f6d5de3fecea94 Mon Sep 17 00:00:00 2001
From: Mansur Besleney <besleneymansur@gmail.com>
Date: Tue, 30 Sep 2025 14:32:40 +0300
Subject: [PATCH] Fix null reference in extra properties mapping

Added a null check for ExtraProperties before iterating to prevent possible NullReferenceException when mapping extra properties.
---
 .../Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs
index 3876ee09a1..4fd72ded4b 100644
--- a/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs
+++ b/framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs
@@ -227,10 +227,15 @@ public class MapperlyAutoObjectMappingProvider : IAutoObjectMappingProvider
             return extraProperties;
         }
 
-        foreach (var property in hasExtraProperties.ExtraProperties)
+
+        if(hasExtraProperties.ExtraProperties is not null)
         {
-            extraProperties.Add(property.Key, property.Value);
+            foreach (var property in hasExtraProperties.ExtraProperties)
+            {
+                extraProperties.Add(property.Key, property.Value);
+            }
         }
+        
         return extraProperties;
     }