forked from amazingfate/loongoffice
33d55465d9
The problem is that there is a ZipEntry ZipPackageStream::aEntry which does not necessarily correspond to the values read from the Zip central directory, because of a call to ZipPackageStream::setSize() in ZipPackageStream::successfullyWritten() to override nSize and nMethod for encrypted entries. This triggers the consistency checks in readLOC(), where this aEntry is passed. Refactor things so that ZipPackageStream::aEntry and thus hopefully all ZipEntry instances correspond to the Zip file's central directory. For encrypted entries, store the decompressed size (which is read from manifest.xml) in m_nOwnStreamOrigSize and pass it as a separate parameter to the ZipFile functions that need it, and ultimately to XUnbufferedStream, resolving multiple TODO comments. (regression from commit efae4fc42d5fe3c0a69757226f38efc10d101194) Change-Id: Ib6ea32595c6027b98da9196a2e2bd0a99b62a983 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173273 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
96 lines
3.6 KiB
C++
96 lines
3.6 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
#ifndef INCLUDED_PACKAGE_SOURCE_ZIPAPI_XUNBUFFEREDSTREAM_HXX
|
|
#define INCLUDED_PACKAGE_SOURCE_ZIPAPI_XUNBUFFEREDSTREAM_HXX
|
|
|
|
#include <optional>
|
|
|
|
#include <com/sun/star/io/XSeekable.hpp>
|
|
#include <com/sun/star/io/XInputStream.hpp>
|
|
#include <com/sun/star/xml/crypto/XCipherContext.hpp>
|
|
|
|
#include <comphelper/refcountedmutex.hxx>
|
|
#include <cppuhelper/implbase.hxx>
|
|
#include <rtl/ref.hxx>
|
|
#include <package/Inflater.hxx>
|
|
#include <ZipEntry.hxx>
|
|
#include <CRC32.hxx>
|
|
|
|
namespace com::sun::star::uno {
|
|
class XComponentContext;
|
|
}
|
|
|
|
#define UNBUFF_STREAM_DATA 0
|
|
#define UNBUFF_STREAM_RAW 1
|
|
#define UNBUFF_STREAM_WRAPPEDRAW 2
|
|
|
|
class EncryptionData;
|
|
class XUnbufferedStream final : public cppu::WeakImplHelper
|
|
<
|
|
css::io::XInputStream
|
|
>
|
|
{
|
|
rtl::Reference<comphelper::RefCountedMutex> maMutexHolder;
|
|
|
|
css::uno::Reference < css::io::XInputStream > mxZipStream;
|
|
css::uno::Reference < css::io::XSeekable > mxZipSeek;
|
|
css::uno::Sequence < sal_Int8 > maCompBuffer, maHeader;
|
|
ZipEntry maEntry;
|
|
sal_Int32 mnBlockSize;
|
|
css::uno::Reference< css::xml::crypto::XCipherContext > m_xCipherContext;
|
|
ZipUtils::Inflater maInflater;
|
|
bool mbRawStream, mbWrappedRaw;
|
|
sal_Int16 mnHeaderToRead;
|
|
sal_Int64 mnZipCurrent, mnZipEnd, mnZipSize, mnMyCurrent;
|
|
CRC32 maCRC;
|
|
bool mbCheckCRC;
|
|
|
|
public:
|
|
XUnbufferedStream(
|
|
const css::uno::Reference< css::uno::XComponentContext >& xContext,
|
|
rtl::Reference<comphelper::RefCountedMutex> aMutexHolder,
|
|
ZipEntry const & rEntry,
|
|
css::uno::Reference < css::io::XInputStream > const & xNewZipStream,
|
|
const ::rtl::Reference< EncryptionData >& rData,
|
|
sal_Int8 nStreamMode,
|
|
::std::optional<sal_Int64> oDecryptedSize,
|
|
const OUString& aMediaType,
|
|
bool bRecoveryMode );
|
|
|
|
// allows to read package raw stream
|
|
XUnbufferedStream(
|
|
rtl::Reference<comphelper::RefCountedMutex> aMutexHolder,
|
|
const css::uno::Reference < css::io::XInputStream >& xRawStream,
|
|
const ::rtl::Reference< EncryptionData >& rData );
|
|
|
|
sal_Int64 getSize() const { return mnZipSize; }
|
|
|
|
virtual ~XUnbufferedStream() override;
|
|
|
|
// XInputStream
|
|
virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
|
|
virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
|
|
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
|
|
virtual sal_Int32 SAL_CALL available( ) override;
|
|
virtual void SAL_CALL closeInput( ) override;
|
|
};
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|