[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - package/source

[Caolán McNamara]

 package/source/zipapi/ZipFile.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 942e23ac0cf885c8d26884fa1fb17d430f42a5f5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 23 12:53:34 2018 +0000

    forcepoint #5 check for short read
    
    a zip file within a structured storage stream. underlying storage stream
    claims larger size that it can satisfy on read
    
    Change-Id: I8516b12df33ad78b2525192826f5e3aef2622eb8
    Reviewed-on: https://gerrit.libreoffice.org/50240
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index cb85ecd655ae..41846dc85f29 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -802,11 +802,14 @@ sal_Int32 ZipFile::findEND()
         nEnd = nPos >= 0 ? nPos : 0 ;
 
         aGrabber.seek( nEnd );
-        aGrabber.readBytes ( aBuffer, nLength - nEnd );
+
+        auto nSize = nLength - nEnd;
+        if (nSize != aGrabber.readBytes(aBuffer, nSize))
+            throw ZipException("Zip END signature not found!" );
 
         const sal_Int8 *pBuffer = aBuffer.getConstArray();
 
-        nPos = nLength - nEnd - ENDHDR;
+        nPos = nSize - ENDHDR;
         while ( nPos >= 0 )
         {
             if (pBuffer[nPos] == 'P' && pBuffer[nPos+1] == 'K' && pBuffer[nPos+2] == 5 && pBuffer[nPos+3] == 6 )