Skip to content

bmp: add pixel count limit for large dimensions #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TristanInSec wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −0
Open

bmp: add pixel count limit for large dimensions #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions bmp/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,14 @@ func decodeConfig(r io.Reader) (config image.Config, bitsPerPixel int, topDown b
if width < 0 || height < 0 {
return image.Config{}, 0, false, false, ErrUnsupported
}
// Reject dimensions where the pixel buffer would be unreasonably large.
// At 4 bytes per pixel (NRGBA), this limit caps the allocation at ~4 GiB,
// which prevents image.New* from panicking on oversized inputs. This is
// consistent with the TIFF decoder's use of maxChunkSize for similar
// bounds checking.
if int64(width)*int64(height) > 1<<30 {
return image.Config{}, 0, false, false, ErrUnsupported
}
// We only support 1 plane and 8, 24 or 32 bits per pixel and no
// compression.
planes, bpp, compression := readUint16(b[26:28]), readUint16(b[28:30]), readUint32(b[30:34])
Expand Down