[Libreoffice-commits] core.git: filter/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Sep 28 13:13:58 UTC 2020


 filter/source/graphicfilter/itiff/itiff.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 414feaef4171cb1f43f49f8446024269d2ca0d02
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 28 10:04:46 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 28 15:13:17 2020 +0200

    ofz#26000 don't bother with loop if nOrigPos is 0
    
    Change-Id: I628bac1c06046155869417190c73d00140e85aff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103539
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 4a15becae1b8..7d62e3f45500 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -405,8 +405,11 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
                 try
                 {
                     aStripOffsets.resize(nDataLen);
-                    for (size_t i = 0; i < nOldNumSO; ++i)
-                        aStripOffsets[i] += nOrigPos;
+                    if (nOrigPos)
+                    {
+                        for (size_t i = 0; i < nOldNumSO; ++i)
+                            aStripOffsets[i] += nOrigPos;
+                    }
                     for (size_t i = nOldNumSO; i < aStripOffsets.size(); ++i)
                         aStripOffsets[i] = ReadIntData() + nOrigPos;
                 }


More information about the Libreoffice-commits mailing list