diff --git a/4-bugfix-for-CVE-2025-52885.patch b/4-bugfix-for-CVE-2025-52885.patch new file mode 100644 index 0000000000000000000000000000000000000000..0f4e8933b4dbda9f77d74ea2b5996d19febc03c4 --- /dev/null +++ b/4-bugfix-for-CVE-2025-52885.patch @@ -0,0 +1,29 @@ +From 4ce27cc826bf90cc8dbbd8a8c87bd913cccd7ec0 Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse +Date: Wed, 3 Sep 2025 14:36:54 +0100 +Subject: [PATCH] Check for duplicate entries + +Reference:https://gitlab.freedesktop.org/poppler/poppler/-/commit/4ce27cc826bf90cc8dbbd8a8c87bd913cccd7ec0 +Conflict:no +--- + poppler/StructTreeRoot.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/poppler/StructTreeRoot.cc b/poppler/StructTreeRoot.cc +index eb46147bd1..fc7bf4ceb0 100644 +--- a/poppler/StructTreeRoot.cc ++++ b/poppler/StructTreeRoot.cc +@@ -136,6 +136,10 @@ void StructTreeRoot::parseNumberTreeNode(const Dict &node) + } + int keyVal = key.getInt(); + std::vector &vec = parentTree[keyVal]; ++ if (!vec.empty()) { ++ error(errSyntaxError, -1, "Nums item at position {0:d} is a duplicate entry for key {1:d}", i, keyVal); ++ continue; ++ } + + Object valueArray = nums.arrayGet(i + 1); + if (valueArray.isArray()) { +-- +GitLab + diff --git a/poppler.spec b/poppler.spec index b9c00fb1d7519916b2f23cc48dd1a4458b23b888..a2a2ebda208993ee9e47b207b82bc3517cbccfa6 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 # %%global qt6 0 Summary: PDF rendering library @@ -13,6 +13,7 @@ Patch1: poppler-0.90.0-position-independent-code.patch Patch2: poppler-21.01.0-glib-introspection.patch # https://gitlab.freedesktop.org/poppler/poppler/-/commit/08d7894e4dd0e313c179e30f06ad8f546619b1b3 Patch3: CVE-2025-50420.patch +Patch4: 4-bugfix-for-CVE-2025-52885.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -240,6 +241,9 @@ other formats. %{_datadir}/locale/* %changelog +* Tue Oct 21 2025 tomcruiseqi - 25.06.0-3 +- Fix CVE-2025-52885 + * Fri Aug 08 2025 wenxin - 25.06.0-2 - Add patch to fix CVE-2025-50420