[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - package/source

[Michael Meeks]

 package/source/zipapi/XUnbufferedStream.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0435aa08f4f6504dee6065ea6e4a55fbb07b8f77
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Jan 5 12:18:18 2018 +0000

    tdf#114819 - include the synthetic encrpytion header into the size.
    
    Change-Id: I090347046725a1ebb7a36f465654c29f7443d20d
    Reviewed-on: https://gerrit.libreoffice.org/47467
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit dc885c071b71e6f6f76bedaecf7f0b1a81dd1d57)
    Reviewed-on: https://gerrit.libreoffice.org/47499
    Reviewed-by: jan iversen <jani at libreoffice.org>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 1e219b698871..162bab6d7580 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -102,6 +102,7 @@ XUnbufferedStream::XUnbufferedStream(
         sal_Int8 * pHeader = maHeader.getArray();
         ZipFile::StaticFillHeader( rData, rEntry.nSize, aMediaType, pHeader );
         mnHeaderToRead = static_cast < sal_Int16 > ( maHeader.getLength() );
+        mnZipSize += mnHeaderToRead;
     }
 }