From: dongsug.song Date: Mon, 18 Dec 2017 05:38:41 +0000 (+0900) Subject: [NUI] depense code for crash of GetProperty()'s null parameter X-Git-Tag: 4.0.1-preview1-00044~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F164210%2F1;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] depense code for crash of GetProperty()'s null parameter Change-Id: I236da0a3a42e1d38cb7201e596f99b42e348a271 Signed-off-by: dongsug.song --- 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(); }