Commitd7f7d5a

committed

Correctly break during decoding

1 parentb496109 commitd7f7d5aCopy full SHA for d7f7d5a

File tree

+22

-6

lines changed

+22

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,18 +204,13 @@ public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken`
`204`	`204`	`break;`
`205`	`205`	`casePngChunkType.FrameControl:`
`206`	`206`	`frameCount++;`
`207`		`-if(frameCount==this.maxFrames)`
`208`		`-{`
`209`		`-break;`
`210`		`-}`
`211`		`-`
`212`	`207`	`currentFrame=null;`
`213`	`208`	`currentFrameControl=this.ReadFrameControlChunk(chunk.Data.GetSpan());`
`214`	`209`	`break;`
`215`	`210`	`casePngChunkType.FrameData:`
`216`	`211`	`if(frameCount==this.maxFrames)`
`217`	`212`	`{`
`218`		`-break;`
	`213`	`+gotoEOF;`
`219`	`214`	`}`
`220`	`215`
`221`	`216`	`if(imageisnull)`
`@@ -271,6 +266,11 @@ public Image<TPixel> Decode<TPixel>(BufferedReadStream stream, CancellationToken`
`271`	`266`	`previousFrameControl=currentFrameControl;`
`272`	`267`	`}`
`273`	`268`
	`269`	`+if(frameCount==this.maxFrames)`
	`270`	`+{`
	`271`	`+gotoEOF;`
	`272`	`+}`
	`273`	`+`
`274`	`274`	`break;`
`275`	`275`	`casePngChunkType.Palette:`
`276`	`276`	`this.palette=chunk.Data.GetSpan().ToArray();`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -701,4 +701,14 @@ public void Decode_BadPalette(string file)`
`701`	`701`	`stringpath=Path.GetFullPath(Path.Combine(TestEnvironment.InputImagesDirectoryFullPath,file));`
`702`	`702`	`usingImageimage=Image.Load(path);`
`703`	`703`	`}`
	`704`	`+`
	`705`	`+[Theory]`
	`706`	`+[WithFile(TestImages.Png.Issue2752,PixelTypes.Rgba32)]`
	`707`	`+publicvoidCanDecodeJustOneFrame<TPixel>(TestImageProvider<TPixel>provider)`
	`708`	`+whereTPixel: unmanaged,IPixel<TPixel>`
	`709`	`+{`
	`710`	`+DecoderOptionsoptions=new(){MaxFrames=1};`
	`711`	`+usingImage<TPixel>image=provider.GetImage(PngDecoder.Instance,options);`
	`712`	`+Assert.Equal(1,image.Frames.Count);`
	`713`	`+}`
`704`	`714`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,9 @@ public static class Png`
`156`	`156`	`// Issue 2668: https://github.com/SixLabors/ImageSharp/issues/2668`
`157`	`157`	`publicconststringIssue2668="Png/issues/Issue_2668.png";`
`158`	`158`
	`159`	`+// Issue 2752: https://github.com/SixLabors/ImageSharp/issues/2752`
	`160`	`+publicconststringIssue2752="Png/issues/Issue_2752.png";`
	`161`	`+`
`159`	`162`	`publicstaticclassBad`
`160`	`163`	`{`
`161`	`164`	`publicconststringMissingDataChunk="Png/xdtn0g01.png";`

Lines changed: 3 additions & 0 deletions

Comments

(0)