Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/ImageSharp/Formats/Png/Chunks/FrameControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,13 @@ public void WriteTo(Span<byte> buffer)
/// <param name="data">The data to parse.</param>
/// <returns>The parsed fcTL.</returns>
public static FrameControl Parse(ReadOnlySpan<byte> data)
=> new(
{
if (data.Length < Size)
{
PngThrowHelper.ThrowInvalidImageContentException("The frame control chunk does not contain enough data!");
}

return new(
sequenceNumber: BinaryPrimitives.ReadUInt32BigEndian(data[..4]),
width: BinaryPrimitives.ReadUInt32BigEndian(data[4..8]),
height: BinaryPrimitives.ReadUInt32BigEndian(data[8..12]),
Expand All @@ -157,4 +163,5 @@ public static FrameControl Parse(ReadOnlySpan<byte> data)
delayDenominator: BinaryPrimitives.ReadUInt16BigEndian(data[22..24]),
disposalMode: (FrameDisposalMode)(data[24] + 1),
blendMode: (FrameBlendMode)data[25]);
}
}
16 changes: 16 additions & 0 deletions tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,22 @@ public void Decode_TruncatedPhysChunk_ExceptionIsThrown()
Assert.Equal("pHYs chunk is too short", exception.Message);
}

// https://github.com/SixLabors/ImageSharp/issues/3093
[Fact]
public void Decode_TruncatedFrameControlChunk_ExceptionIsThrown()
{
// PNG signature + truncated frame control chunk
byte[] payload = Convert.FromHexString(
"89504e470d0a1a0a424d3a00000000007f000000000028030405060000000100" +
"000101002000000000000000000000000000ff00006663544cff190000000000" +
"010000424d000100000101002000000000");

using MemoryStream stream = new(payload);
InvalidImageContentException exception = Assert.Throws<InvalidImageContentException>(() => Image.Load<Rgba32>(stream));

Assert.Equal("The frame control chunk does not contain enough data!", exception.Message);
}

// https://github.com/SixLabors/ImageSharp/issues/3079
[Fact]
public void Decode_CompressedTxtChunk_WithTruncatedData_DoesNotThrow()
Expand Down
Loading