rpms/poppler
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS git poppler-20.11.0-14.el8_10

Browse Source
This commit is contained in:
AlmaLinux RelEng Bot 2026-06-10 02:34:30 -04:00
parent efeacf380e
commit 4b84aa5ee5
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
SOURCES/poppler-20.11.0-tilingPatternFill-overflow.patch Normal file
View File

@ -0,0 +1,29 @@
--- poppler-20.11.0/poppler/SplashOutputDev.cc
+++ poppler-20.11.0/poppler/SplashOutputDev.cc
@@ -43,6 +43,7 @@
// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
// Copyright (C) 2019 Christian Persch <chpe@src.gnome.org>
// Copyright (C) 2020 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright (C) 2026 Marek Kasik <mkasik@redhat.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -4299,7 +4300,7 @@ bool SplashOutputDev::tilingPatternFill(
matc[2] = ctm[2];
matc[3] = ctm[3];
- if (surface_width == 0 || surface_height == 0 || repeatX * repeatY <= 4) {
+ if (surface_width == 0 || surface_height == 0 || repeatX * repeatY <= 4 || checkedMultiply(surface_width, repeatX, &result_width) || checkedMultiply(surface_height, repeatY, &result_height)) {
state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
return false;
}
@@ -4347,9 +4348,6 @@ bool SplashOutputDev::tilingPatternFill(
imgData.repeatY = repeatY;
SplashBitmap *tBitmap = bitmap;
bitmap = formerBitmap;
- result_width = tBitmap->getWidth() * imgData.repeatX;
- result_height = tBitmap->getHeight() * imgData.repeatY;
-
if (splashAbs(matc[1]) > splashAbs(matc[0])) {
kx = -matc[1];
ky = matc[2] - (matc[0] * matc[3]) / matc[1];

9
SPECS/poppler.spec
View File

@ -4,7 +4,7 @@
Summary: PDF rendering library
Name: poppler
Version: 20.11.0
Release: 13%{?dist}
Release: 14%{?dist}
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
URL: http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
@ -54,6 +54,9 @@ Patch31: poppler-20.11.0-pdfinfo-dests.patch
# https://issues.redhat.com/browse/RHEL-131786
Patch32: poppler-20.11.0-check-bitmap-in-combine.patch
# https://issues.redhat.com/browse/RHEL-180567
Patch33: poppler-20.11.0-tilingPatternFill-overflow.patch
BuildRequires: cmake
BuildRequires: gettext-devel
BuildRequires: pkgconfig(cairo)
@ -258,6 +261,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%{_mandir}/man1/*
%changelog
* Sun May 31 2026 Marek Kasik <mkasik@redhat.com> - 20.11.0-14
- Fix integer overflow in tilingPatternFill (CVE-2026-10118)
- Resolves: RHEL-180567
* Tue Dec 16 2025 Marek Kasik <mkasik@redhat.com> - 20.11.0-13
- Check bitmap in combine()
- Resolves: RHEL-131786