ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#166862: fix reading data for CRC calculation

Browse Source 
Commit a6ad198d09 made the size read
from the grabber wrong for the last chunk: it wasn't decreased to
the remaining size, but was still equal to nBlockSize. The grabber
could read past the chunk, and the CRC was wrong. No idea why did
that only hit this file - it seemed that any file larger than 32K
and that was stored (i.e., any image) would trigger that path?

Change-Id: I980dd701e54c4ed565173b5b90ed301bf9b5f719
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186241
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2025-06-07 13:51:57 +02:00
parent 2143c0a694
commit 9727cf7859
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/qa/cppunit/data/tdf166862.odt
BIN
View File
Binary file not shown.
package/qa/cppunit/test_zippackage.cxx
+18
View File
@@ -483,6 +483,24 @@ CPPUNIT_TEST_FIXTURE(ZipPackageTest, testDataDescriptorDirectory)
CPPUNIT_ASSERT_EQUAL(sal_Int64(899), xStream->getPropertyValue(u"Size"_ustr).get<sal_Int64>());
}
CPPUNIT_TEST_FIXTURE(ZipPackageTest, testTdf166862)
{
// This package is broken; but the actual issue was incorrect CRC calculation for an image
OUString aURL = m_directories.getURLFromSrc(u"/package/qa/cppunit/data/tdf166862.odt");
uno::Sequence<uno::Any> args{ uno::Any(aURL), uno::Any(beans::NamedValue{ u"RepairPackage"_ustr,
uno::Any(true) }) };
auto xMgr = m_xContext->getServiceManager();
auto xZip(xMgr->createInstanceWithArgumentsAndContext(ZipPackage, args, m_xContext)
.queryThrow<container::XHierarchicalNameAccess>());
static constexpr OUString picURL = u"Pictures/1000000000000596000000AE0BDDB537.jpg"_ustr;
CPPUNIT_ASSERT(xZip->hasByHierarchicalName(picURL));
auto aPic = xZip->getByHierarchicalName(picURL).queryThrow<beans::XPropertySet>();
// Before the fix, this was 0: the size was reset because of unmatched CRC
CPPUNIT_ASSERT_EQUAL(sal_Int64(43886), aPic->getPropertyValue(u"Size"_ustr).get<sal_Int64>());
}
//CPPUNIT_TEST_SUITE_REGISTRATION(...);
//CPPUNIT_PLUGIN_IMPLEMENT();
package/source/zipapi/ZipFile.cxx
+6 -5
View File
@@ -1943,12 +1943,13 @@ sal_Int32 ZipFile::getCRC( sal_Int64 nOffset, sal_Int64 nSize )
std::vector<sal_Int8> aBuffer(nBlockSize);
aGrabber.seek( nOffset );
sal_Int32 nRead;
for (sal_Int64 ind = 0;
(nRead = aGrabber.readBytes( aBuffer.data(), nBlockSize )) && ind * nBlockSize < nSize;
++ind)
sal_Int64 nRead = 0;
while (nRead < nSize)
{
aCRC.updateSegment(aBuffer.data(), nRead);
sal_Int64 nToRead = std::min(nSize - nRead, nBlockSize);
sal_Int64 nReadThisTime = aGrabber.readBytes(aBuffer.data(), nToRead);
aCRC.updateSegment(aBuffer.data(), nReadThisTime);
nRead += nReadThisTime;
}
return aCRC.getValue();