core.git: Branch 'feature/cib_contract57d' - 3 commits - configure.ac package/source xmloff/source

[Michael Stahl (via logerrit)]

 configure.ac                      |    2 +-
 package/source/zipapi/ZipFile.cxx |    6 ++++++
 xmloff/source/core/xmlimp.cxx     |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit faffdc0640ff4937be2aa032a85ea9405ebee8a0
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Mar 18 10:52:46 2025 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Apr 17 23:29:17 2025 +0200

    tdf#165694 package: log specific message for missing data descriptor bit
    
    Guess based on size of holes.
    
    Change-Id: I6209844dd74164fa56329df8f31eb40664b2b7e1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183062
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Jenkins

diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 45331b19b2f1..a4c701770be1 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -1347,6 +1347,12 @@ sal_Int32 ZipFile::readCEN()
             throw ZipException("Count != Total" );
         if (!unallocated.empty())
         {
+            if (std::all_of(unallocated.begin(), unallocated.end(), [](auto 
const& it) {
+                    return it.second - it.first == 12 || it.second - it.first 
== 16;
+                }))
+            {
+                throw ZipException("Zip file has holes the size of data 
descriptors; producer forgot to set flag bit 3?");
+            }
             throw ZipException("Zip file has holes! It will leak!");
         }
     }
commit 0918958e5910e77935ef312ea5902d0b36560e7c
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Thu Apr 17 21:20:42 2025 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Apr 17 23:29:17 2025 +0200

    Release 6.3.6.34
    
    Change-Id: I7e3f65b62ac34cb9fada5540cc1ab087f65454fb

diff --git a/configure.ac b/configure.ac
index 1549c49261f3..7d421f5375f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.6.33],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.34],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit 7152829cb4a4f08813dc739ae75d6b27bb4739af
Author:     Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu Apr 17 21:17:55 2025 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Apr 17 23:29:17 2025 +0200

    Extra ODF file open logging
    
    Change-Id: I176c7f5c20c495db9f9d05e8d7d48d46ced163b7

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index e14341467527..161c7b465b2c 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -532,7 +532,7 @@ void SAL_CALL SvXMLImport::setNamespaceHandler( const 
uno::Reference< xml::sax::
 
 void SAL_CALL SvXMLImport::startDocument()
 {
-    SAL_INFO( "xmloff.core", "{ SvXMLImport::startDocument" );
+    SAL_INFO( "xmloff.core", "{ SvXMLImport::startDocument <" << 
GetDocumentBase() << "> <" << GetBaseURL() << ">" );
     if (!mxGraphicStorageHandler.is() || !mxEmbeddedResolver.is())
     {
         Reference< lang::XMultiServiceFactory > xFactory( mxModel,  UNO_QUERY 
);