diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-10-06 11:35:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-10-06 15:03:21 +0200 |
| commit | 411f5e9cbd14bc3ffe7024b21434231662f6246d (patch) | |
| tree | 4ee4c06f6ca3b5b78daf6a41176d6be113b11ae7 /filter/source/graphicfilter/itiff/itiff.cxx | |
| parent | 02ab7371e10172bdf3474551f3912a148cdf66e2 (diff) | |
ofz#3566: fix oom
Change-Id: Id5bf172d49c61ad8000a5917759a54eaa0c8467e
Reviewed-on: https://gerrit.libreoffice.org/43195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter/source/graphicfilter/itiff/itiff.cxx')
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 0e27706c8fde..83dbc0b72424 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1374,7 +1374,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) nBytesPerRow = nRowSize; } - if ( bStatus ) + if (bStatus) { //sanity check consider ReadMap condition for last row and //last plane @@ -1441,7 +1441,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) bStatus = false; } } - else if ( nCompression == 5 ) + else if (nCompression == 5) { sal_uInt32 np = nPlanes - 1; if (np >= SAL_N_ELEMENTS(aMap)) @@ -1464,6 +1464,13 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) bStatus = false; } } + else if (nCompression == 32773) + { + } + else + { + bStatus = false; + } } if ( bStatus ) |