Skip to content
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

Jump to bottom

Fix bounds overflow in PCX decoding #4506

Merged
merged 3 commits into from Apr 1, 2020
Merged

Fix bounds overflow in PCX decoding #4506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
124f4bb
Tests for PCX OOB Access
wiredfool Mar 9, 2020
6a83e43
Fix OOB Access on PcxDecode.c
wiredfool Mar 9, 2020
ada137e
Fix Flake8
hugovk Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added Tests/images/01r_00.pcx
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions Tests/test_image.py
View file
Open in desktop
Expand Up @@ -638,13 +638,17 @@ def test_pillow_version(self, test_module):
assert test_module.PILLOW_VERSION > "7.0.0"

def test_overrun(self):
""" For overrun completeness, test as:
valgrind pytest -qq Tests/test_image.py::TestImage::test_overrun | grep decode.c
"""
for file in [
"fli_overrun.bin",
"sgi_overrun.bin",
"sgi_overrun_expandrow.bin",
"sgi_overrun_expandrow2.bin",
"pcx_overrun.bin",
"pcx_overrun2.bin",
"01r_00.pcx",
]:
with Image.open(os.path.join("Tests/images", file)) as im:
try:
Expand Down
5 changes: 1 addition & 4 deletions src/libImaging/PcxDecode.c
View file
Open in desktop
Expand Up @@ -22,10 +22,7 @@ ImagingPcxDecode(Imaging im, ImagingCodecState state, UINT8* buf, Py_ssize_t byt
UINT8 n;
UINT8* ptr;

if (strcmp(im->mode, "1") == 0 && state->xsize > state->bytes * 8) {
state->errcode = IMAGING_CODEC_OVERRUN;
return -1;
} else if (strcmp(im->mode, "P") == 0 && state->xsize > state->bytes) {
if ((state->xsize * state->bits + 7) / 8 > state->bytes) {
state->errcode = IMAGING_CODEC_OVERRUN;
return -1;
}
Expand Down