[NUI] Fix svace issue for MergeStyle
authorzhouleonlei <zhouleon.lei@samsung.com>
Wed, 27 Jan 2021 01:52:51 +0000 (09:52 +0800)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Wed, 27 Jan 2021 06:14:37 +0000 (15:14 +0900)
src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs

index 751172f..58d9683 100755 (executable)
@@ -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;
             }
         }