Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Prevent for possible null reference exception
support21adadea6908
diff --git a/src/Core/Grand.Domain/Data/LiteDb/LiteDBRepository.cs b/src/Core/Grand.Domain/Data/LiteDb/LiteDBRepository.csindex 9dc99fe3c..77f63b830 100644--- a/src/Core/Grand.Domain/Data/LiteDb/LiteDBRepository.cs+++ b/src/Core/Grand.Domain/Data/LiteDb/LiteDBRepository.cs@@ -290,7 +290,7 @@ namespace Grand.Domain.Data.LiteDbvar propertyInfo = entity?.GetType().GetProperty(name,BindingFlags.Public | BindingFlags.Instance);- propertyInfo.SetValue(entity, item.Value);+ propertyInfo?.SetValue(entity, item.Value);}_collection.Update(entity);return Task.CompletedTask;@@ -389,11 +389,11 @@ namespace Grand.Domain.Data.LiteDbvar propertyField = position.GetType().GetProperty(item.Name,BindingFlags.Public | BindingFlags.Instance);- propertyField.SetValue(position, item.GetValue(value));+ propertyField?.SetValue(position, item.GetValue(value));}- var updatelist = BsonMapper.Global.Serialize<IList<U>>(list);- entity[fieldName] = updatelist;+ var updateList = BsonMapper.Global.Serialize<IList<U>>(list);+ entity[fieldName] = updateList;collection.Update(entity);}return Task.CompletedTask;diff --git a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.csindex 7782347c1..0f3c0fac2 100644--- a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs+++ b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs@@ -64,17 +64,17 @@ namespace Widgets.Slider.Components}if (widgetZone == SliderWidgetDefaults.WidgetZoneCategoryPage){- var slides = await _sliderService.GetPictureSliders(SliderType.Category, additionalData.ToString());+ var slides = await _sliderService.GetPictureSliders(SliderType.Category, additionalData?.ToString());await PrepareModel(slides, model);}if (widgetZone == SliderWidgetDefaults.WidgetZoneCollectionPage){- var slides = await _sliderService.GetPictureSliders(SliderType.Collection, additionalData.ToString());+ var slides = await _sliderService.GetPictureSliders(SliderType.Collection, additionalData?.ToString());await PrepareModel(slides, model);}if (widgetZone == SliderWidgetDefaults.WidgetZoneBrandPage){- var slides = await _sliderService.GetPictureSliders(SliderType.Brand, additionalData.ToString());+ var slides = await _sliderService.GetPictureSliders(SliderType.Brand, additionalData?.ToString());await PrepareModel(slides, model);}diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.csindex c7e6864d5..ba93ddb18 100644--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs@@ -650,7 +650,7 @@ namespace Grand.Web.Admin.Servicesvar existingPwI = product.ProductWarehouseInventory.FirstOrDefault(x => x.WarehouseId == warehouse.Id);if (existingPwI != null){- if (whim.WarehouseUsed)+ if (whim is { WarehouseUsed: true }){//update existing recordexistingPwI.StockQuantity = whim.StockQuantity;@@ -665,7 +665,7 @@ namespace Grand.Web.Admin.Services}else{- if (whim.WarehouseUsed)+ if (whim is { WarehouseUsed: true }){//no need to insert a record for qty 0existingPwI = new ProductWarehouseInventory {@@ -1138,7 +1138,7 @@ namespace Grand.Web.Admin.Services}}- if (!product.ProductCategories.Any(x => x.CategoryId == model.CategoryId))+ if (product != null && product.ProductCategories.All(x => x.CategoryId != model.CategoryId)){var productCategory = new ProductCategory {CategoryId = model.CategoryId,@@ -1225,7 +1225,7 @@ namespace Grand.Web.Admin.Services}}- if (!product.ProductCollections.Any(x => x.CollectionId == collectionId))+ if (product != null && product.ProductCollections.All(x => x.CollectionId != collectionId)){var productCollection = new ProductCollection {CollectionId = collectionId,@@ -2012,16 +2012,17 @@ namespace Grand.Web.Admin.Servicesif (attribute.ShouldHaveValues()){//values- var attributeValues = product.ProductAttributeMappings.FirstOrDefault(x => x.Id == attribute.Id).ProductAttributeValues;- foreach (var attributeValue in attributeValues)- {- var attributeValueModel = new ProductAttributeConditionModel.ProductAttributeValueModel {- Id = attributeValue.Id,- Name = attributeValue.Name,- IsPreSelected = attributeValue.IsPreSelected- };- attributeModel.Values.Add(attributeValueModel);- }+ var attributeValues = product.ProductAttributeMappings.FirstOrDefault(x => x.Id == attribute.Id)?.ProductAttributeValues;+ if (attributeValues != null)+ foreach (var attributeValue in attributeValues)+ {+ var attributeValueModel = new ProductAttributeConditionModel.ProductAttributeValueModel {+ Id = attributeValue.Id,+ Name = attributeValue.Name,+ IsPreSelected = attributeValue.IsPreSelected+ };+ attributeModel.Values.Add(attributeValueModel);+ }//pre-select attribute and valueif (selectedPva != null && attribute.Id == selectedPva.Id)@@ -2368,7 +2369,7 @@ namespace Grand.Web.Admin.Servicesvar existingPwI = combination.WarehouseInventory.FirstOrDefault(x => x.WarehouseId == warehouse.Id);if (existingPwI != null){- if (whim.WarehouseUsed)+ if (whim is { WarehouseUsed: true }){//updateexistingPwI.StockQuantity = whim.StockQuantity;@@ -2382,7 +2383,7 @@ namespace Grand.Web.Admin.Services}else{- if (whim.WarehouseUsed)+ if (whim is { WarehouseUsed: true }){//no need to insert a record for qty 0existingPwI = new ProductCombinationWarehouseInventory {@@ -2520,7 +2521,7 @@ namespace Grand.Web.Admin.Serviceselse{var combination = product.ProductAttributeCombinations.FirstOrDefault(x => x.Id == model.Id);- var prevcombination = (ProductAttributeCombination)combination.Clone();+ var prevCombination = (ProductAttributeCombination)combination!.Clone();combination.StockQuantity = model.StockQuantity;combination.ReservedQuantity = model.ReservedQuantity;@@ -2540,7 +2541,7 @@ namespace Grand.Web.Admin.Services}//notification - out of stock- await OutOfStockNotifications(product, combination, prevcombination);+ await OutOfStockNotifications(product, combination, prevCombination);//update combinationawait _productAttributeService.UpdateProductAttributeCombination(combination, product.Id);