Fixes potential NRE conditions

J Wyman · J Wyman · commit d1e43bd3505a · 2015-06-24T07:50:33.000-07:00
diff --git a/LibGit2Sharp/Core/EncodingMarshaler.cs b/LibGit2Sharp/Core/EncodingMarshaler.cs
@@ -59,7 +59,7 @@ public virtual Object MarshalNativeToManaged(IntPtr pNativeData)
 
         public static unsafe IntPtr FromManaged(Encoding encoding, String value)
         {
-            if (value == null)
+            if (encoding == null || value == null)
             {
                 return IntPtr.Zero;
             }
diff --git a/LibGit2Sharp/Core/Ensure.cs b/LibGit2Sharp/Core/Ensure.cs
@@ -133,7 +133,13 @@ private static readonly Dictionary<GitErrorCode, Func<string, GitErrorCode, GitE
         private static void HandleError(int result)
         {
             string errorMessage;
-            GitError error = NativeMethods.giterr_last().MarshalAsGitError();
+            GitError error = null;
+            var errHandle = NativeMethods.giterr_last();
+
+            if (errHandle != null && !errHandle.IsInvalid)
+            {
+                error = errHandle.MarshalAsGitError();
+            }
 
             if (error == null)
             {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public virtual Object MarshalNativeToManaged(IntPtr pNativeData)`
`59`	`59`
`60`	`60`	`public static unsafe IntPtr FromManaged(Encoding encoding, String value)`
`61`	`61`	`{`
`62`		`- if (value == null)`
	`62`	`+ if (encoding == null \|\| value == null)`
`63`	`63`	`{`
`64`	`64`	`return IntPtr.Zero;`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,13 @@ private static readonly Dictionary<GitErrorCode, Func<string, GitErrorCode, GitE`
`133`	`133`	`private static void HandleError(int result)`
`134`	`134`	`{`
`135`	`135`	`string errorMessage;`
`136`		`- GitError error = NativeMethods.giterr_last().MarshalAsGitError();`
	`136`	`+ GitError error = null;`
	`137`	`+ var errHandle = NativeMethods.giterr_last();`
	`138`	`+`
	`139`	`+ if (errHandle != null && !errHandle.IsInvalid)`
	`140`	`+ {`
	`141`	`+ error = errHandle.MarshalAsGitError();`
	`142`	`+ }`
`137`	`143`
`138`	`144`	`if (error == null)`
`139`	`145`	`{`