Merge pull request #1374 from github/fixes/1240-nullref-diffservice

Avoid possible NRE in DiffService.

Author: jcansdale

src/GitHub.Exports/Models/DiffUtilities.cs

@@ -13,6 +13,8 @@ public static class DiffUtilities
 
         public static IEnumerable<DiffChunk> ParseFragment(string diff)
         {
+            Guard.ArgumentNotNull(diff, nameof(diff));
+
             var reader = new LineReader(diff);
             string line;
             DiffChunk chunk = null;

src/GitHub.InlineReviews/Services/DiffService.cs

@@ -32,7 +32,15 @@ public async Task<IReadOnlyList<DiffChunk>> Diff(
             string path)
         {
             var patch = await gitClient.Compare(repo, baseSha, headSha, path);
-            return DiffUtilities.ParseFragment(patch).ToList();
+
+            if (patch != null)
+            {
+                return DiffUtilities.ParseFragment(patch).ToList();
+            }
+            else
+            {
+                return new DiffChunk[0];
+            }
         }
 
         /// <inheritdoc/>
@@ -44,7 +52,15 @@ public async Task<IReadOnlyList<DiffChunk>> Diff(
             byte[] contents)
         {
             var changes = await gitClient.CompareWith(repo, baseSha, headSha, path, contents);
-            return DiffUtilities.ParseFragment(changes.Patch).ToList();
+
+            if (changes?.Patch != null)
+            {
+                return DiffUtilities.ParseFragment(changes.Patch).ToList();
+            }
+            else
+            {
+                return new DiffChunk[0];
+            }
         }
     }
 }