Merge pull request #621 from rhodosaur/fix619

AArnott · web-flow · commit a6fa0fa971ea · 2021-06-22T06:53:48.000-06:00
Include missing zlib compression level header checks
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}");
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ public ZLibStream(Stream stream, long length = -1)`
`56`	`56`	`Span<byte> zlibHeader = stackalloc byte[2];`
`57`	`57`	`stream.ReadAll(zlibHeader);`
`58`	`58`
`59`		`- if (zlibHeader[0] != 0x78 \|\| (zlibHeader[1] != 0x01 && zlibHeader[1] != 0x9C))`
	`59`	`+ if (zlibHeader[0] != 0x78 \|\| (zlibHeader[1] != 0x01 && zlibHeader[1] != 0x9C && zlibHeader[1] != 0x5E && zlibHeader[1] != 0xDA))`
`60`	`60`	`{`
`61`		`- throw new GitException();`
	`61`	`+ throw new GitException($"Invalid zlib header {zlibHeader[0]:X2} {zlibHeader[1]:X2}");`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`