From 3efad499bf4f7623610a54f9f14622de4954352f Mon Sep 17 00:00:00 2001
From: Michael Stahl <michael.stahl@allotropia.de>
Date: Mon, 14 Oct 2024 12:04:05 +0200
Subject: [PATCH] tdf#163364 package: ask to recover for this invalid ODF
 package

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 32cad89592ec04ab552399095c91dd76afb3002c)

Change-Id: Iafe610d507cf92d2fd2e9c3040592c3e638a30dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174889
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
---
 package/qa/cppunit/data/tdf163364.ods    | Bin 0 -> 2572 bytes
 package/qa/cppunit/test_zippackage.cxx   |  28 +++++++++++++++++++++++
 package/source/zippackage/ZipPackage.cxx |   8 +++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/qa/cppunit/data/tdf163364.ods

diff --git a/package/qa/cppunit/data/tdf163364.ods b/package/qa/cppunit/data/tdf163364.ods
new file mode 100644
index 0000000000000000000000000000000000000000..a772aebdbc7ee2b7e4ce882b4bccada2ab9f52a4
GIT binary patch
literal 2572
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

literal 0
HcmV?d00001

diff --git a/package/qa/cppunit/test_zippackage.cxx b/package/qa/cppunit/test_zippackage.cxx
index 624457ab7bcf..892f2979cd61 100644
--- a/package/qa/cppunit/test_zippackage.cxx
+++ b/package/qa/cppunit/test_zippackage.cxx
@@ -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();
 
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 0ddc0906e02a..371f37807be9 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -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 << "\"");