From: zhouleonlei <zhouleon.lei@samsung.com>
Date: Wed, 27 Jan 2021 01:52:51 +0000 (+0800)
Subject: [NUI] Fix svace issue for MergeStyle
X-Git-Tag: submit/tizen_6.0/20210128.005235~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=882162d041386f5b030db9b64921979a133b94cc;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI] Fix svace issue for MergeStyle
---

diff --git a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs b/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs
index 751172ff9..58d968393 100755
--- a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs
@@ -133,9 +133,9 @@ namespace Tizen.NUI.Binding
                 BindableProperty implicitStyleProperty = BindableProperty.Create(nameof(ImplicitStyle), typeof(Style), typeof(View), default(Style),
                         propertyChanged: (bindable, oldvalue, newvalue) => OnImplicitStyleChanged());
                 _implicitStyles.Add(implicitStyleProperty);
-                Target.SetDynamicResource(implicitStyleProperty, type?.FullName);
+                Target.SetDynamicResource(implicitStyleProperty, type.FullName);
                 type = type.GetTypeInfo().BaseType;
-                if (s_stopAtTypes.Contains(type))
+                if (type != null && s_stopAtTypes.Contains(type))
                     return;
             }
         }