Better safehandles

LibGit2Sharp/BlameHunk.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using LibGit2Sharp.Core;
+using LibGit2Sharp.Core.Handles;
 
 namespace LibGit2Sharp
 {
@@ -42,12 +43,18 @@ internal unsafe BlameHunk(IRepository repository, git_blame_hunk* rawHunk)
             // Signature objects need to have ownership of their native pointers
             if (rawHunk->final_signature != null)
             {
-                FinalSignature = new Signature(rawHunk->final_signature);
+                var ptr = new IntPtr(rawHunk->final_signature);
+                var signatureHandle = new SignatureHandle(ptr, false);
+
+                FinalSignature = new Signature(signatureHandle);
             }
 
             if (rawHunk->orig_signature != null)
             {
-                InitialSignature = new Signature(rawHunk->orig_signature);
+                var ptr = new IntPtr(rawHunk->orig_signature);
+                var signatureHandle = new SignatureHandle(ptr, false);
+
+                InitialSignature = new Signature(signatureHandle);
             }
         }
 

LibGit2Sharp/Configuration.cs

@@ -52,9 +52,9 @@ internal Configuration(
         private void Init(Repository repository)
         {
             configHandle = Proxy.git_config_new();
-            RepositoryHandle repoHandle = (repository != null) ? repository.Handle : null;
+            RepositoryHandle repoHandle = repository?.Handle ?? new RepositoryHandle();
 
-            if (repoHandle != null)
+            if (!repoHandle.IsInvalid)
             {
                 //TODO: push back this logic into libgit2.
                 // As stated by @carlosmn "having a helper function to load the defaults and then allowing you

LibGit2Sharp/Core/GitFilter.cs

@@ -118,7 +118,7 @@ public delegate int git_filter_stream_fn(
     [StructLayout(LayoutKind.Sequential)]
     internal unsafe struct git_filter_source
     {
-        public git_repository* repository;
+        public IntPtr repository;
 
         public char* path;
 

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,20 +83,20 @@ 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;
         private readonly Guid id;
 #endif
 
-        internal unsafe Libgit2Object(void* ptr, bool owned)
-            : this(new IntPtr(ptr), owned)
+        internal unsafe Libgit2Object()
+            : base(IntPtr.Zero, true)
         {
         }
 
         internal unsafe Libgit2Object(IntPtr ptr, bool owned)
-            : base(owned)
+            : base(IntPtr.Zero, owned)
         {
             SetHandle(ptr);
 
@@ -108,12 +108,12 @@ internal unsafe Libgit2Object(IntPtr ptr, bool owned)
 #endif
         }
 
-        internal IntPtr AsIntPtr() => DangerousGetHandle();
+        public override bool IsInvalid => handle == IntPtr.Zero;
 
         protected override void Dispose(bool disposing)
         {
 #if LEAKS_IDENTIFYING
-            bool leaked = !disposing && DangerousGetHandle() != IntPtr.Zero;
+            bool leaked = !disposing && !IsInvalid;
 
             if (leaked)
             {