Merge pull request #621 from rhodosaur/fix619

Include missing zlib compression level header checks
dotnet · Jun 22, 2021 · a6fa0fa · a6fa0fa
2 parents a0fb5ac + 480626d
commit a6fa0fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs b/src/NerdBank.GitVersioning/ManagedGit/ZLibStream.cs
@@ -56,9 +56,9 @@ public ZLibStream(Stream stream, long length = -1)
             Span<byte> zlibHeader = stackalloc byte[2];
             stream.ReadAll(zlibHeader);
 
-            if (zlibHeader[0] != 0x78 || (zlibHeader[1] != 0x01 && zlibHeader[1] != 0x9C))
+            if (zlibHeader[0] != 0x78 || (zlibHeader[1] != 0x01 && zlibHeader[1] != 0x9C && zlibHeader[1] != 0x5E && zlibHeader[1] != 0xDA))
             {
-                throw new GitException();
+                throw new GitException($"Invalid zlib header {zlibHeader[0]:X2} {zlibHeader[1]:X2}");
             }
         }