Correctly guard image dimensions

Erik-White · Erik-White · commit 7bc09d0b3a68 · 2026-02-13T21:49:11.000+01:00
diff --git a/src/ImageSharp.Textures/TextureFormats/Decoding/AstcDecoder.cs b/src/ImageSharp.Textures/TextureFormats/Decoding/AstcDecoder.cs
@@ -61,8 +61,8 @@ public static byte[] DecompressImage(
         byte compressedBytesPerBlock)
     {
         ArgumentNullException.ThrowIfNull(blockData);
-        ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(0, width);
-        ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(0, height);
+        ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(width, 0);
+        ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(height, 0);
 
         if (compressedBytesPerBlock != AstcBlockSize)
         {
diff --git a/tests/ImageSharp.Textures.Tests/TextureFormats/Decoding/AstcDecoderTests.cs b/tests/ImageSharp.Textures.Tests/TextureFormats/Decoding/AstcDecoderTests.cs
@@ -168,7 +168,6 @@ public void DecompressImage_WithZeroWidth_ThrowsArgumentOutOfRangeException()
             AstcDecoder.DecompressImage(blockData, 0, 256, 4, 4, 16));
 
         Assert.Equal("width", ex.ParamName);
-        Assert.Contains("greater than 0", ex.Message);
     }
 
     [Fact]
@@ -191,7 +190,6 @@ public void DecompressImage_WithZeroHeight_ThrowsArgumentOutOfRangeException()
             AstcDecoder.DecompressImage(blockData, 256, 0, 4, 4, 16));
 
         Assert.Equal("height", ex.ParamName);
-        Assert.Contains("greater than 0", ex.Message);
     }
 
     [Fact]

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ public static byte[] DecompressImage(`
`61`	`61`	`byte compressedBytesPerBlock)`
`62`	`62`	`{`
`63`	`63`	`ArgumentNullException.ThrowIfNull(blockData);`
`64`		`- ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(0, width);`
`65`		`- ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(0, height);`
	`64`	`+ ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(width, 0);`
	`65`	`+ ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(height, 0);`
`66`	`66`
`67`	`67`	`if (compressedBytesPerBlock != AstcBlockSize)`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@ public void DecompressImage_WithZeroWidth_ThrowsArgumentOutOfRangeException()`
`168`	`168`	`AstcDecoder.DecompressImage(blockData, 0, 256, 4, 4, 16));`
`169`	`169`
`170`	`170`	`Assert.Equal("width", ex.ParamName);`
`171`		`- Assert.Contains("greater than 0", ex.Message);`
`172`	`171`	`}`
`173`	`172`
`174`	`173`	`[Fact]`
`@@ -191,7 +190,6 @@ public void DecompressImage_WithZeroHeight_ThrowsArgumentOutOfRangeException()`
`191`	`190`	`AstcDecoder.DecompressImage(blockData, 256, 0, 4, 4, 16));`
`192`	`191`
`193`	`192`	`Assert.Equal("height", ex.ParamName);`
`194`		`- Assert.Contains("greater than 0", ex.Message);`
`195`	`193`	`}`
`196`	`194`
`197`	`195`	`[Fact]`