From: Jiyun Yang <ji.yang@samsung.com>
Date: Wed, 21 Apr 2021 03:52:21 +0000 (+0900)
Subject: [NUI] Fix svace issues in EXaml and Accessibility (#2936)
X-Git-Tag: citest_t1~74
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3900db14b2576f8bda7d693da4a6af324f9f53f;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI] Fix svace issues in EXaml and Accessibility (#2936)

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
---

diff --git a/src/Tizen.NUI/src/internal/EXaml/Operation/SetProperty.cs b/src/Tizen.NUI/src/internal/EXaml/Operation/SetProperty.cs
index ef9f547..1b21e89 100755
--- a/src/Tizen.NUI/src/internal/EXaml/Operation/SetProperty.cs
+++ b/src/Tizen.NUI/src/internal/EXaml/Operation/SetProperty.cs
@@ -38,6 +38,11 @@ namespace Tizen.NUI.EXaml
             object instance = LoadEXaml.GatheredInstances[instanceIndex];
             var property = GatherProperty.GatheredProperties[propertyIndex];
 
+            if (property == null)
+            {
+                return;
+            }
+
             if (value is Instance)
             {
                 int valueIndex = (value as Instance).Index;
diff --git a/src/Tizen.NUI/src/public/Accessibility/Accessibility.cs b/src/Tizen.NUI/src/public/Accessibility/Accessibility.cs
index f36489d..c467ae9 100755
--- a/src/Tizen.NUI/src/public/Accessibility/Accessibility.cs
+++ b/src/Tizen.NUI/src/public/Accessibility/Accessibility.cs
@@ -169,7 +169,7 @@ namespace Tizen.NUI.Accessibility
         {
             using (View view = GetCurrentlyHighlightedView())
             {
-                return view.ClearAccessibilityHighlight();
+                return view?.ClearAccessibilityHighlight() ?? false;
             }
         }
         #endregion Method