Skip to content

Commit

Permalink
Fix negative size read in TiffDecode.c
Browse files Browse the repository at this point in the history
* Caught by oss-fuzz runs
* CVE-2021-25290
  • Loading branch information
wiredfool authored and radarhere committed Mar 1, 2021
1 parent f891baa commit e25be1e
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 1 deletion.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 7 additions & 1 deletion Tests/test_tiff_crashes.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,14 @@
"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")
Expand Down
4 changes: 4 additions & 0 deletions src/libImaging/TiffDecode.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ tsize_t _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));

Expand Down

0 comments on commit e25be1e

Please sign in to comment.