summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Steele <david.steele@samsung.com>2017-09-25 10:15:03 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2017-09-25 10:15:03 +0000
commitacff8932137ff700cf7b8b50fb98c31189a9cd25 (patch)
treea66a64199e2ad662aeaf9b7525253b3fe1c54a0c
parente8abec802c418774eee18bdfdfea1e50ce1d8302 (diff)
parent5b9ec617d47329baa14f666e76b2271c1e9f5190 (diff)
downloadnui-acff8932137ff700cf7b8b50fb98c31189a9cd25.tar.gz
nui-acff8932137ff700cf7b8b50fb98c31189a9cd25.tar.bz2
nui-acff8932137ff700cf7b8b50fb98c31189a9cd25.zip
Merge "fix crash: HasBody() null reference" into devel/master
-rwxr-xr-xTizen.NUI/src/public/BaseHandle.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/Tizen.NUI/src/public/BaseHandle.cs b/Tizen.NUI/src/public/BaseHandle.cs
index e0d7ecc..130d455 100755
--- a/Tizen.NUI/src/public/BaseHandle.cs
+++ b/Tizen.NUI/src/public/BaseHandle.cs
@@ -307,6 +307,11 @@ namespace Tizen.NUI
public bool HasBody()
{
+ if (disposed == true)
+ {
+ return false;
+ }
+
bool ret = NDalicPINVOKE.BaseHandle_HasBody(swigCPtr);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
@@ -314,6 +319,11 @@ namespace Tizen.NUI
public bool IsEqual(BaseHandle rhs)
{
+ if (disposed == true)
+ {
+ return false;
+ }
+
bool ret = NDalicPINVOKE.BaseHandle_IsEqual(swigCPtr, BaseHandle.getCPtr(rhs));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;