strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#163364 package: ask to recover for this invalid ODF package

Browse source 
Bugdoc has a data descriptor on a folder entry, which is very odd and
entirely pointless.  Which is also the first entry, so it's an invalid
ODF package anyway.

ZipPackageFolder throws UnknownPropertyException for "WasEncrypted",
which results in General I/O error, but we want to ask the user if the
file should be opened in recovery mode.

(regression from commit 32cad89592)

Change-Id: Iafe610d507cf92d2fd2e9c3040592c3e638a30dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174889
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Michael Stahl 2024-10-14 12:04:05 +02:00
parent 574874a554
commit 3efad499bf
3 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
package/qa/cppunit/data/tdf163364.ods Normal file
View file

Binary file not shown.

28
package/qa/cppunit/test_zippackage.cxx
View file

@ -384,6 +384,34 @@ CPPUNIT_TEST_FIXTURE(ZipPackageTest, testZip64End)
}
}
CPPUNIT_TEST_FIXTURE(ZipPackageTest, testTdf163364)
{
auto const url(m_directories.getURLFromSrc(u"/package/qa/cppunit/data/tdf163364.ods"));
uno::Sequence<uno::Any> const args{
uno::Any(url),
uno::Any(beans::NamedValue("StorageFormat", uno::Any(embed::StorageFormats::PACKAGE)))
};
// don't load corrupted zip file
CPPUNIT_ASSERT_THROW(m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
ZipPackage, args, m_xContext),
css::packages::zip::ZipIOException);
try
{
uno::Sequence<uno::Any> const args2{
uno::Any(url), uno::Any(beans::NamedValue(u"RepairPackage"_ustr, uno::Any(true))),
uno::Any(beans::NamedValue("StorageFormat", uno::Any(embed::StorageFormats::ZIP)))
};
m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(ZipPackage, args2,
m_xContext);
}
catch (css::packages::zip::ZipIOException const&)
{
// check that this doesn't crash, it doesn't matter if it succeeds or not
}
}
//CPPUNIT_TEST_SUITE_REGISTRATION(...);
//CPPUNIT_PLUGIN_IMPLEMENT();

8
package/source/zippackage/ZipPackage.cxx
View file

@ -192,6 +192,14 @@ void ZipPackage::checkZipEntriesWithDD()
{
uno::Reference<XPropertySet> xStream;
getByHierarchicalName(rEntry.sPath) >>= xStream;
uno::Reference<XServiceInfo> const xStreamSI{xStream, uno::UNO_QUERY_THROW};
if (!xStreamSI->supportsService("com.sun.star.packages.PackageStream"))
{
SAL_INFO("package", "entry STORED with data descriptor is folder: \"" << rEntry.sPath << "\"");
throw ZipIOException(
THROW_WHERE
"entry STORED with data descriptor is folder");
}
if (!xStream->getPropertyValue("WasEncrypted").get<bool>())
{
SAL_INFO("package", "entry STORED with data descriptor but not encrypted: \"" << rEntry.sPath << "\"");