From 0032183596fcdc0c8709b6fdb2ef0b15ff81a9b6 Mon Sep 17 00:00:00 2001
From: Kyungwook Tak <k.tak@samsung.com>
Date: Fri, 4 Nov 2016 13:02:54 +0900
Subject: [PATCH] Remove IsInvalid check in ReleaseHandle

ReleaseHandle is called only when IsInvalid is false.
Refer: https://msdn.microsoft.com/en-us/library/system.runtime.interopservices.safehandle.releasehandle(v=vs.110).aspx

Change-Id: Icff0eff4e5f9e8ef88b1518a7187d05ca0962426
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
---
 .../Tizen.Security.SecureRepository/Certificate.cs                     | 2 --
 Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs | 3 ---
 .../Tizen.Security.SecureRepository/Pkcs12.cs                          | 3 ---
 .../Tizen.Security.SecureRepository/SafeAliasListHandle.cs             | 3 ---
 .../Tizen.Security.SecureRepository/SafeCertificateListHandle.cs       | 3 ---
 .../Tizen.Security.SecureRepository/SafeRawBufferHandle.cs             | 3 ---
 6 files changed, 17 deletions(-)

diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs
index 2615689..e7bfdd2 100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Certificate.cs
@@ -113,8 +113,6 @@ namespace Tizen.Security.SecureRepository
         /// <returns>true if the handle is released successfully.</returns>
         protected override bool ReleaseHandle()
         {
-            if (IsInvalid) // do not release
-                return true;
             Interop.CkmcTypes.CertFree(handle);
             this.SetHandle(IntPtr.Zero);
             return true;
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs
index 83fcb41..577b823 100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Key.cs
@@ -112,9 +112,6 @@ namespace Tizen.Security.SecureRepository
         /// <returns>true if the handle is released successfully</returns>
         protected override bool ReleaseHandle()
         {
-            if (IsInvalid) // do not release
-                return true;
-
             Interop.CkmcTypes.KeyFree(handle);
             this.SetHandle(IntPtr.Zero);
             return true;
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs
index e0ca65b..5c9635d 100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/Pkcs12.cs
@@ -159,9 +159,6 @@ namespace Tizen.Security.SecureRepository
         /// <returns>true if the handle is released successfully</returns>
         protected override bool ReleaseHandle()
         {
-            if (IsInvalid) // do not release
-                return true;
-
             Interop.CkmcTypes.Pkcs12Free(handle);
             this.SetHandle(IntPtr.Zero);
             return true;
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs
index d7a5005..a6f12ab 100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeAliasListHandle.cs
@@ -57,9 +57,6 @@ namespace Tizen.Security.SecureRepository
         /// <returns>true if the handle is released successfully</returns>
         protected override bool ReleaseHandle()
         {
-            if (IsInvalid) // do not release
-                return true;
-
             Interop.CkmcTypes.AliasListAllFree(handle);
             this.SetHandle(IntPtr.Zero);
             return true;
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs
index 8c7bea9..2d97c50 100755
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeCertificateListHandle.cs
@@ -104,9 +104,6 @@ namespace Tizen.Security.SecureRepository
         /// <returns>true if the handle is released successfully</returns>
         protected override bool ReleaseHandle()
         {
-            if (handle == IntPtr.Zero) // do not release
-                return true;
-
             Interop.CkmcTypes.CertListAllFree(handle);
             this.SetHandle(IntPtr.Zero);
             return true;
diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs
index 437e414..66fa93e 100644
--- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs
+++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository/SafeRawBufferHandle.cs
@@ -60,9 +60,6 @@ namespace Tizen.Security.SecureRepository
         /// <returns>true if the handle is released successfully</returns>
         protected override bool ReleaseHandle()
         {
-            if (IsInvalid) // do not release
-                return true;
-
             Interop.CkmcTypes.BufferFree(handle);
             this.SetHandle(IntPtr.Zero);
             return true;
-- 
2.7.4