From ab11df3e993e892f4af5f4d77e368c51de606e24 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Mon, 18 Dec 2017 14:38:41 +0900 Subject: [PATCH] [NUI] depense code for crash of GetProperty()'s null parameter Change-Id: I236da0a3a42e1d38cb7201e596f99b42e348a271 Signed-off-by: dongsug.song --- src/Tizen.NUI/src/internal/Object.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Tizen.NUI/src/internal/Object.cs b/src/Tizen.NUI/src/internal/Object.cs index b197472..2d64e4c 100755 --- a/src/Tizen.NUI/src/internal/Object.cs +++ b/src/Tizen.NUI/src/internal/Object.cs @@ -27,6 +27,11 @@ namespace Tizen.NUI { public static PropertyValue GetProperty(global::System.Runtime.InteropServices.HandleRef handle, int index) { + if(handle.Handle == System.IntPtr.Zero) + { + throw new System.InvalidOperationException("Error! NUI's native dali object is already disposed. OR the native dali object handle of NUI becomes null!"); + } + PropertyValue ret = new PropertyValue(NDalicPINVOKE.Handle_GetProperty(handle, index), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -34,6 +39,11 @@ namespace Tizen.NUI public static void SetProperty(global::System.Runtime.InteropServices.HandleRef handle, int index, PropertyValue propertyValue) { + if (handle.Handle == System.IntPtr.Zero) + { + throw new System.InvalidOperationException("Error! NUI's native dali object is already disposed. OR the native dali object handle of NUI becomes null!"); + } + NDalicPINVOKE.Handle_SetProperty(handle, index, PropertyValue.getCPtr(propertyValue)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } -- 2.7.4