core.git: Branch 'libreoffice-24-2-5' - package/source

[Michael Stahl (via logerrit)]

 package/source/zippackage/ZipPackage.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 70497c9c9935de1184617045ad0712293af1120c
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Jul 5 13:55:31 2024 +0200
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Jul 10 11:47:34 2024 +0200

    package: avoid throwing RuntimeException in getZipFileContents()
    
    Translate it to ZipIOException.
    
    Change-Id: I7a07a59c0ba301b92f31696355c73ccbdf119ff8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170013
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit c409c83d777fdb6291c7cd03186b69fe4e7fd902)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170030
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit bcb6130ef8ab66a99347945c1c30ec0112d6940e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170230
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 0f3fa6ff7dba..a1aff4c54042 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -626,7 +626,11 @@ void ZipPackage::getZipFileContents()
                 if ( !pCurrent->hasByName( sTemp ) )
                 {
                     rtl::Reference<ZipPackageFolder> pPkgFolder = new 
ZipPackageFolder(m_xContext, m_nFormat, m_bAllowRemoveOnInsert);
-                    pPkgFolder->setName( sTemp );
+                    try {
+                        pPkgFolder->setName( sTemp );
+                    } catch (uno::RuntimeException const& e) {
+                        throw css::packages::zip::ZipIOException(e.Message);
+                    }
                     pPkgFolder->doSetParent( pCurrent );
                     pCurrent = pPkgFolder.get();
                 }