diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-10-14 15:13:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-10-14 17:13:47 +0200 |
| commit | 2e49822ee7b3a77ac148997c7958cfa8d31090eb (patch) | |
| tree | 180f172a57cdf4204590218e55ae39dc9125b844 /vcl | |
| parent | 17c85818faedd639ca6deb63a0a0b5dc1db6969c (diff) | |
ofz#51830 Timeout
Change-Id: I934db0f86b118d4bb7876f162060ef75595fcef7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141376
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/itiff/itiff.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/filter/itiff/itiff.cxx b/vcl/source/filter/itiff/itiff.cxx index c6c102df9464..2dda51469ce7 100644 --- a/vcl/source/filter/itiff/itiff.cxx +++ b/vcl/source/filter/itiff/itiff.cxx @@ -158,8 +158,9 @@ bool ImportTiffGraphicImport(SvStream& rTIFF, Graphic& rGraphic) if (bOk && bFuzzing) { - const uint64_t MAX_SIZE = 150000000; - if (TIFFTileSize64(tif) > MAX_SIZE || nPixelsRequired > MAX_SIZE) + const uint64_t MAX_PIXEL_SIZE = 150000000; + const uint64_t MAX_TILE_SIZE = 100000000; + if (TIFFTileSize64(tif) > MAX_TILE_SIZE || nPixelsRequired > MAX_PIXEL_SIZE) { SAL_WARN("filter.tiff", "skipping large tiffs"); break; @@ -177,7 +178,7 @@ bool ImportTiffGraphicImport(SvStream& rTIFF, Graphic& rGraphic) TIFFGetField(tif, TIFFTAG_TILELENGTH, &th) == 1) { uint32_t nLogLBufferRequired; - bOk = !o3tl::checked_multiply(tw, th, nLogLBufferRequired) && nLogLBufferRequired < MAX_SIZE; + bOk = !o3tl::checked_multiply(tw, th, nLogLBufferRequired) && nLogLBufferRequired < MAX_PIXEL_SIZE; SAL_WARN_IF(!bOk, "filter.tiff", "skipping oversized tiff tile " << tw << " x " << th); } } |