From: Eunki, Hong <eunkiki.hong@samsung.com>
Date: Tue, 19 Mar 2024 03:48:49 +0000 (+0900)
Subject: [NUI][API10] Fix SVACE issue (ViewStyle.cs CopyFrom null check)
X-Git-Tag: accepted/tizen/7.0/unified/20240319.152955~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcfe1f740ae4f43f9e32ed8463ea885eec07d9b3;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI][API10] Fix SVACE issue (ViewStyle.cs CopyFrom null check)

This PR is copy of #5982

Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
---

diff --git a/src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs b/src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs
index e927adc..d7a0b61 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs
@@ -566,14 +566,14 @@ namespace Tizen.NUI.BaseComponents
         {
             var source = other as ViewStyle;
 
-            IncludeDefaultStyle = source.IncludeDefaultStyle;
-            SolidNull = source.SolidNull;
-
             if (source == null || source.DirtyProperties == null || source.DirtyProperties.Count == 0)
             {
                 return;
             }
 
+            IncludeDefaultStyle = source.IncludeDefaultStyle;
+            SolidNull = source.SolidNull;
+
             BindableProperty.GetBindablePropertysOfType(GetType(), out var thisBindableProperties);
 
             if (thisBindableProperties == null)