summaryrefslogtreecommitdiff
path: root/package/inc
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2024-08-13 17:59:18 +0200
committerAndras Timar <andras.timar@collabora.com>2024-08-23 11:17:13 +0200
commit996218bce9e6075f1e5725d7aa00dc55c36d1edc (patch)
treef7e6ae5d5bec2b91aabc61626496bb54a2859d74 /package/inc
parent011545763de57ea6d059da6d50216a3e92720d89 (diff)
package: ZipPackage: add additional check for entries STORED with
... data descriptor; only allow it for encrypted ODF entries, which requires reading the manifest first. Change-Id: If36d31a4cb93e7af78f48be3ed899ad9d9bb28f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171911 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 32cad89592ec04ab552399095c91dd76afb3002c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171779 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'package/inc')
-rw-r--r--package/inc/ZipPackage.hxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index dbfbfe1bc17d..9848396dcf11 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -104,6 +104,7 @@ class ZipPackage final : public cppu::WeakImplHelper
bool isLocalFile() const;
+ void checkZipEntriesWithDD();
void parseManifest();
void parseContentType();
void getZipFileContents();