Merge pull request libgit2#1070 from whoisj/fix-crash-submodule-delete

nulltoken · nulltoken · commit 7202df7e971c · 2015-06-04T01:00:33.000+02:00
Fixes Issue libgit2#1071: Deadlock in Submodules when Directory Structure Changes
diff --git a/LibGit2Sharp/Core/Handles/OidSafeHandle.cs b/LibGit2Sharp/Core/Handles/OidSafeHandle.cs
@@ -7,7 +7,7 @@ internal class OidSafeHandle : NotOwnedSafeHandleBase
     {
         private GitOid? MarshalAsGitOid()
         {
-            return IsInvalid ? null : (GitOid?)MarshalAsGitOid(handle);
+            return IsZero || IsInvalid ? null : (GitOid?)MarshalAsGitOid(handle);
         }
 
         private static GitOid MarshalAsGitOid(IntPtr data)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ internal class OidSafeHandle : NotOwnedSafeHandleBase`
`7`	`7`	`{`
`8`	`8`	`private GitOid? MarshalAsGitOid()`
`9`	`9`	`{`
`10`		`- return IsInvalid ? null : (GitOid?)MarshalAsGitOid(handle);`
	`10`	`+ return IsZero \|\| IsInvalid ? null : (GitOid?)MarshalAsGitOid(handle);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`private static GitOid MarshalAsGitOid(IntPtr data)`