Merge pull request libgit2#1079 from whoisj/fix-coverity-concurrency-issues

nulltoken · nulltoken · commit 7cb2d7ee2c31 · 2015-06-08T23:41:08.000+02:00
Fixes a trio of concurrency issues found by Coverity
diff --git a/LibGit2Sharp/Core/Handles/SafeHandleBase.cs b/LibGit2Sharp/Core/Handles/SafeHandleBase.cs
@@ -66,7 +66,15 @@ public static void Clear()
         /// </summary>
         public static IEnumerable<string> TypeNames
         {
-            get { return _typeNames.ToArray(); }
+            get
+            {
+                string[] result = null;
+                lock (_lockpad)
+                {
+                    result = _typeNames.ToArray();
+                }
+                return result;
+            }
         }
     }
 }
diff --git a/LibGit2Sharp/Core/LazyGroup.cs b/LibGit2Sharp/Core/LazyGroup.cs
@@ -24,18 +24,19 @@ public ILazy<TResult> AddLazy<TResult>(Func<T, TResult> func)
 
         public void Evaluate()
         {
-            if (evaluated)
-                return;
-
             lock (@lock)
             {
                 if (evaluated)
+                {
                     return;
+                }
 
                 EvaluateInternal(input =>
                                  {
                                      foreach (var e in evaluators)
+                                     {
                                          e.Evaluate(input);
+                                     }
                                  });
                 evaluated = true;
             }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,15 @@ public static void Clear()`
`66`	`66`	`/// </summary>`
`67`	`67`	`public static IEnumerable<string> TypeNames`
`68`	`68`	`{`
`69`		`- get { return _typeNames.ToArray(); }`
	`69`	`+ get`
	`70`	`+ {`
	`71`	`+ string[] result = null;`
	`72`	`+ lock (_lockpad)`
	`73`	`+ {`
	`74`	`+ result = _typeNames.ToArray();`
	`75`	`+ }`
	`76`	`+ return result;`
	`77`	`+ }`
`70`	`78`	`}`
`71`	`79`	`}`
`72`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,19 @@ public ILazy<TResult> AddLazy<TResult>(Func<T, TResult> func)`
`24`	`24`
`25`	`25`	`public void Evaluate()`
`26`	`26`	`{`
`27`		`- if (evaluated)`
`28`		`- return;`
`29`		`-`
`30`	`27`	`lock (@lock)`
`31`	`28`	`{`
`32`	`29`	`if (evaluated)`
	`30`	`+ {`
`33`	`31`	`return;`
	`32`	`+ }`
`34`	`33`
`35`	`34`	`EvaluateInternal(input =>`
`36`	`35`	`{`
`37`	`36`	`foreach (var e in evaluators)`
	`37`	`+ {`
`38`	`38`	`e.Evaluate(input);`
	`39`	`+ }`
`39`	`40`	`});`
`40`	`41`	`evaluated = true;`
`41`	`42`	`}`