mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-14 03:57:15 +00:00
libcupsfilters: upgrade 2.1.1 -> 2.2.1
Drop 0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch and CVE-2025-64503.patch, pdftoraster.cxx was removed and the CVE is fixed in this release. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
3 files changed
+1
-86
No files matched your search
-36
@@ -1,36 +0,0 @@
|
||||
From 104fba23b1c0c67c92777b3165c6dca99558a656 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 6 Feb 2023 18:13:52 -0800
|
||||
Subject: [PATCH] use noexcept(false) instead of throw() from c++17 onwards
|
||||
|
||||
C++17 removed dynamic exception specifications [1]
|
||||
they had been deprecated since C++11, replace
|
||||
throw(whatever) with noexcept(false).
|
||||
|
||||
[1] https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html
|
||||
|
||||
Upstream-Status: Backport [https://github.com/OpenPrinting/cups-filters/commit/2076627d33477212f21352ad39e9d305adb63af3]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
filter/pdftoraster.cxx | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx
|
||||
index e8af184fb..e91e22459 100755
|
||||
@@ -2199,11 +2199,11 @@
|
||||
// For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW
|
||||
// should be used as a guard, otherwise use traditional definition
|
||||
#ifndef _GLIBCXX_THROW
|
||||
-# if __cplusplus >= 201103L
|
||||
-# define _GLIBCXX_THROW(_EXC)
|
||||
-# else
|
||||
-# define _GLIBCXX_THROW(_EXC) throw(_EXC)
|
||||
-# endif
|
||||
+#if __cplusplus < 201703L
|
||||
+#define _GLIBCXX_THROW throw
|
||||
+#else
|
||||
+#define _GLIBCXX_THROW(x) noexcept(false)
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
void * operator new(size_t size) _GLIBCXX_THROW (std::bad_alloc)
|
||||
@@ -1,47 +0,0 @@
|
||||
From da9a7db3b9125c87b11c43b05354ca2eb21ed684 Mon Sep 17 00:00:00 2001
|
||||
From: Gyorgy Sarvari <skandigraun@gmail.com>
|
||||
Date: Mon, 10 Nov 2025 21:10:56 +0100
|
||||
Subject: [PATCH] Fix out-of-bounds write in cfFilterPDFToRaster()
|
||||
|
||||
From: Till Kamppeter <till.kamppeter@gmail.com>
|
||||
|
||||
PDFs with too large page dimensions could cause an integer overflow and then a too small buffer for the pixel line to be allocated.
|
||||
|
||||
Fixed this by cropping the page size to the maximum allowed by the standard, 14400x14400pt, 200x200in, 5x5m
|
||||
|
||||
https://community.adobe.com/t5/indesign-discussions/maximum-width-of-a-pdf/td-p/9217372
|
||||
|
||||
Fixes CVE-2025-64503
|
||||
|
||||
CVE: CVE-2025-64503
|
||||
Upstream-Status: Backport [https://github.com/OpenPrinting/libcupsfilters/commit/fd01543f372ca3ba1f1c27bd3427110fa0094e3f]
|
||||
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
||||
---
|
||||
cupsfilters/pdftoraster.cxx | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx
|
||||
index 0235b54..09583df 100644
|
||||
--- a/cupsfilters/pdftoraster.cxx
|
||||
+++ b/cupsfilters/pdftoraster.cxx
|
||||
@@ -1606,6 +1606,20 @@ out_page(pdftoraster_doc_t *doc,
|
||||
l = inputPageBox.height();
|
||||
if (l < 0)
|
||||
l = -l;
|
||||
+
|
||||
+ //
|
||||
+ // Maximum allowed page size for PDF is 200x200 inches (~ 5x5 m), or 14400x14400 pt
|
||||
+ // https://community.adobe.com/t5/indesign-discussions/maximum-width-of-a-pdf/td-p/9217372
|
||||
+ //
|
||||
+ if (doc->header.cupsPageSize[0] > 14400) {
|
||||
+ fprintf(stderr, "ERROR: Page width is %.2fpt, too large, cropping to 14400pt\n", doc->header.cupsPageSize[0]);
|
||||
+ doc->header.cupsPageSize[0] = 14400;
|
||||
+ }
|
||||
+ if (doc->header.cupsPageSize[1] > 14400) {
|
||||
+ fprintf(stderr, "ERROR: Page height is %.2fpt, too large, cropping to 14400pt\n", doc->header.cupsPageSize[1]);
|
||||
+ doc->header.cupsPageSize[1] = 14400;
|
||||
+ }
|
||||
+
|
||||
if (rotate == 90 || rotate == 270)
|
||||
doc->header.cupsPageSize[0] = l;
|
||||
else
|
||||
+1
-3
@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aab2024bd2a475438a154cd1640c9684"
|
||||
DEPENDS = "cups fontconfig libexif dbus lcms qpdf poppler libpng jpeg tiff"
|
||||
|
||||
SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \
|
||||
file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch \
|
||||
file://CVE-2025-64503.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "6c303e36cfde05a6c88fb940c62b6a18e7cdbfb91f077733ebc98f104925ce36"
|
||||
SRC_URI[sha256sum] = "0a22b849d5068c4c86b20fbb4192d3faa3dabcc9ee844c8fd73710ed821d4860"
|
||||
|
||||
inherit autotools gettext pkgconfig github-releases
|
||||
|
||||
Reference in new issue
Block a user