python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-10 19:56:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix negative size read in TiffDecode.c

Browse Source 
* Caught by oss-fuzz runs
* CVE-2021-25290
This commit is contained in:
Eric Soroos 2021-01-08 18:45:42 +01:00 committed by Andrew Murray
parent 4853e522bd
commit 86f02f7c70
8 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/crash-0c7e0e8e11ce787078f00b5b0ca409a167f070e0.tif Normal file
View File

Binary file not shown.

BIN
Tests/images/crash-1185209cf7655b5aed8ae5e77784dfdd18ab59e9.tif Normal file
View File

Binary file not shown.

BIN
Tests/images/crash-338516dbd2f0e83caddb8ce256c22db3bd6dc40f.tif Normal file
View File

Binary file not shown.

BIN
Tests/images/crash-4f085cc12ece8cde18758d42608bed6a2a2cfb1c.tif Normal file
View File

Binary file not shown.

BIN
Tests/images/crash-86214e58da443d2b80820cff9677a38a33dcbbca.tif Normal file
View File

Binary file not shown.

BIN
Tests/images/crash-f46f5b2f43c370fe65706c11449f567ecc345e74.tif Normal file
View File

Binary file not shown.

8
Tests/test_tiff_crashes.py
View File

@ -24,8 +24,14 @@ from .helper import on_ci
"Tests/images/crash_1.tif",
"Tests/images/crash_2.tif",
"Tests/images/crash-2020-10-test.tif",
"Tests/images/crash-1152ec2d1a1a71395b6f2ce6721c38924d025bf3.tif",
"Tests/images/crash-0c7e0e8e11ce787078f00b5b0ca409a167f070e0.tif",
"Tests/images/crash-0e16d3bfb83be87356d026d66919deaefca44dac.tif",
"Tests/images/crash-1152ec2d1a1a71395b6f2ce6721c38924d025bf3.tif",
"Tests/images/crash-1185209cf7655b5aed8ae5e77784dfdd18ab59e9.tif",
"Tests/images/crash-338516dbd2f0e83caddb8ce256c22db3bd6dc40f.tif",
"Tests/images/crash-4f085cc12ece8cde18758d42608bed6a2a2cfb1c.tif",
"Tests/images/crash-86214e58da443d2b80820cff9677a38a33dcbbca.tif",
"Tests/images/crash-f46f5b2f43c370fe65706c11449f567ecc345e74.tif",
],
)
@pytest.mark.filterwarnings("ignore:Possibly corrupt EXIF data")

4
src/libImaging/TiffDecode.c
View File

@ -55,6 +55,10 @@ _tiffReadProc(thandle_t hdata, tdata_t buf, tsize_t size) {
TRACE(("_tiffReadProc: %d \n", (int)size));
dump_state(state);
if (state->loc > state->eof) {
TIFFError("_tiffReadProc", "Invalid Read at loc %d, eof: %d", state->loc, state->eof);
return 0;
}
to_read = min(size, min(state->size, (tsize_t)state->eof) - (tsize_t)state->loc);
TRACE(("to_read: %d\n", (int)to_read));