Use SafeHandle as base class

Author: bording

LibGit2Sharp/Core/Handles/Libgit2Object.cs

@@ -18,7 +18,7 @@
 //#define LEAKS_TRACKING
 
 using System;
-using Microsoft.Win32.SafeHandles;
+using System.Runtime.InteropServices;
 
 #if LEAKS_IDENTIFYING
 namespace LibGit2Sharp.Core
@@ -83,7 +83,7 @@ namespace LibGit2Sharp.Core.Handles
     using System.Globalization;
 #endif
 
-    internal unsafe abstract class Libgit2Object : SafeHandleZeroOrMinusOneIsInvalid
+    internal unsafe abstract class Libgit2Object : SafeHandle
     {
 #if LEAKS_TRACKING
         private readonly string trace;
@@ -96,7 +96,7 @@ internal unsafe Libgit2Object(void* ptr, bool owned)
         }
 
         internal unsafe Libgit2Object(IntPtr ptr, bool owned)
-            : base(owned)
+            : base(IntPtr.Zero, owned)
         {
             SetHandle(ptr);
 
@@ -108,12 +108,14 @@ internal unsafe Libgit2Object(IntPtr ptr, bool owned)
 #endif
         }
 
+        public override bool IsInvalid => handle == IntPtr.Zero;
+
         internal IntPtr AsIntPtr() => DangerousGetHandle();
 
         protected override void Dispose(bool disposing)
         {
 #if LEAKS_IDENTIFYING
-            bool leaked = !disposing && DangerousGetHandle() != IntPtr.Zero;
+            bool leaked = !disposing && !IsInvalid;
 
             if (leaked)
             {