[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - filter/source

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/ipict/ipict.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9a06536cc595d3ed82bfd1d3c11e87c1d82710c3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Feb 5 21:02:52 2021 +0000
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Mon Feb 8 14:58:07 2021 +0100

    ofz#30117 OOM
    
    Change-Id: Iaa428f28ba36b21766d9cf2f7c622a179daf0002
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110492
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110513
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 43b872f09558..16b5c3f6be6e 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1966,7 +1966,11 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
         else
             nPos+=1+nSize;
 
-        pPict->Seek(nPos);
+        if (!checkSeek(*pPict, nPos))
+        {
+            pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
+            break;
+        }
     }
 
     pVirDev->SetClipRegion();