Guard Repository.Ignore against invalid parameters

nulltoken · nulltoken · commit 7f723ca8290e · 2013-02-20T23:54:17.000+01:00
Fix libgit2#346
diff --git a/LibGit2Sharp.Tests/IgnoreFixture.cs b/LibGit2Sharp.Tests/IgnoreFixture.cs
@@ -1,4 +1,5 @@
-﻿using System.IO;
+﻿using System;
+using System.IO;
 using System.Linq;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
@@ -44,7 +45,26 @@ public void IsPathIgnoredShouldVerifyWhetherPathIsIgnored()
                 repo.Ignore.ResetAllTemporaryRules();
 
                 Assert.False(repo.Ignore.IsPathIgnored("Foo.cs"));
-            }           
+            }
+        }
+
+        [Fact]
+        public void CallingIsPathIgnoredWithBadParamsThrows()
+        {
+            using (var repo = new Repository(StandardTestRepoWorkingDirPath))
+            {
+                Assert.Throws<ArgumentException>(() => repo.Ignore.IsPathIgnored(string.Empty));
+                Assert.Throws<ArgumentNullException>(() => repo.Ignore.IsPathIgnored(null));
+            }
+        }
+
+        [Fact]
+        public void AddingATemporaryRuleWithBadParamsThrows()
+        {
+            using (var repo = new Repository(StandardTestRepoWorkingDirPath))
+            {
+                Assert.Throws<ArgumentNullException>(() => repo.Ignore.AddTemporaryRules(null));
+            }
         }
     }
 }
diff --git a/LibGit2Sharp/Ignore.cs b/LibGit2Sharp/Ignore.cs
@@ -31,6 +31,8 @@ internal Ignore(Repository repo)
         /// <param name="rules">The content of a .gitignore file that will be applied.</param>
         public virtual void AddTemporaryRules(IEnumerable<string> rules)
         {
+            Ensure.ArgumentNotNull(rules, "rules");
+
             var allRules = rules.Aggregate(new StringBuilder(), (acc, x) =>
             {
                 acc.Append(x);
@@ -59,6 +61,8 @@ public virtual void ResetAllTemporaryRules()
         /// <returns>true if the path should be ignored.</returns>
         public virtual bool IsPathIgnored(string relativePath)
         {
+            Ensure.ArgumentNotNullOrEmptyString(relativePath, "relativePath");
+
             return Proxy.git_ignore_path_is_ignored(repo.Handle, relativePath);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ internal Ignore(Repository repo)`
`31`	`31`	`/// <param name="rules">The content of a .gitignore file that will be applied.</param>`
`32`	`32`	`public virtual void AddTemporaryRules(IEnumerable<string> rules)`
`33`	`33`	`{`
	`34`	`+ Ensure.ArgumentNotNull(rules, "rules");`
	`35`	`+`
`34`	`36`	`var allRules = rules.Aggregate(new StringBuilder(), (acc, x) =>`
`35`	`37`	`{`
`36`	`38`	`acc.Append(x);`
`@@ -59,6 +61,8 @@ public virtual void ResetAllTemporaryRules()`
`59`	`61`	`/// <returns>true if the path should be ignored.</returns>`
`60`	`62`	`public virtual bool IsPathIgnored(string relativePath)`
`61`	`63`	`{`
	`64`	`+ Ensure.ArgumentNotNullOrEmptyString(relativePath, "relativePath");`
	`65`	`+`
`62`	`66`	`return Proxy.git_ignore_path_is_ignored(repo.Handle, relativePath);`
`63`	`67`	`}`
`64`	`68`	`}`