From 1042e88d22f6b0de1bc104be9127ebabeaa2c9d8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 8 Nov 2022 01:44:37 -0500 Subject: [PATCH] import poppler-20.11.0-5.el8 --- SOURCES/poppler-20.11.0-hints.patch | 58 +++++++++++++++++++++++++++++ SPECS/poppler.spec | 10 ++++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 SOURCES/poppler-20.11.0-hints.patch diff --git a/SOURCES/poppler-20.11.0-hints.patch b/SOURCES/poppler-20.11.0-hints.patch new file mode 100644 index 0000000..85becf3 --- /dev/null +++ b/SOURCES/poppler-20.11.0-hints.patch @@ -0,0 +1,58 @@ +From 81044c64b9ed9a10ae82a28bac753060bdfdac74 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 15 Mar 2022 15:14:32 +0100 +Subject: Hints::readTables: bail out if we run out of file when reading + +Fixes #1230 + +diff --git a/poppler/Hints.cc b/poppler/Hints.cc +index 79f04088..4707e1c6 100644 +--- a/poppler/Hints.cc ++++ b/poppler/Hints.cc +@@ -5,7 +5,7 @@ + // This file is licensed under the GPLv2 or later + // + // Copyright 2010, 2012 Hib Eris +-// Copyright 2010, 2011, 2013, 2014, 2016-2019 Albert Astals Cid ++// Copyright 2010, 2011, 2013, 2014, 2016-2019, 2021, 2022 Albert Astals Cid + // Copyright 2010, 2013 Pino Toscano + // Copyright 2013 Adrian Johnson + // Copyright 2014 Fabio D'Urso +@@ -189,21 +189,31 @@ void Hints::readTables(BaseStream *str, Linearization *linearization, XRef *xref + char *p = &buf[0]; + + if (hintsOffset && hintsLength) { +- Stream *s = str->makeSubStream(hintsOffset, false, hintsLength, Object(objNull)); ++ std::unique_ptr s(str->makeSubStream(hintsOffset, false, hintsLength, Object(objNull))); + s->reset(); + for (unsigned int i = 0; i < hintsLength; i++) { +- *p++ = s->getChar(); ++ const int c = s->getChar(); ++ if (unlikely(c == EOF)) { ++ error(errSyntaxWarning, -1, "Found EOF while reading hints"); ++ ok = false; ++ return; ++ } ++ *p++ = c; + } +- delete s; + } + + if (hintsOffset2 && hintsLength2) { +- Stream *s = str->makeSubStream(hintsOffset2, false, hintsLength2, Object(objNull)); ++ std::unique_ptr s(str->makeSubStream(hintsOffset2, false, hintsLength2, Object(objNull))); + s->reset(); + for (unsigned int i = 0; i < hintsLength2; i++) { +- *p++ = s->getChar(); ++ const int c = s->getChar(); ++ if (unlikely(c == EOF)) { ++ error(errSyntaxWarning, -1, "Found EOF while reading hints2"); ++ ok = false; ++ return; ++ } ++ *p++ = c; + } +- delete s; + } + + MemStream *memStream = new MemStream(&buf[0], 0, bufLength, Object(objNull)); diff --git a/SPECS/poppler.spec b/SPECS/poppler.spec index c2234f9..20a8467 100644 --- a/SPECS/poppler.spec +++ b/SPECS/poppler.spec @@ -4,7 +4,7 @@ Summary: PDF rendering library Name: poppler Version: 20.11.0 -Release: 4%{?dist} +Release: 5%{?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 @@ -27,6 +27,9 @@ Patch22: poppler-20.11.0-check-gdatetime.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2002575 Patch23: poppler-20.11.0-bad-generation.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2087190 +Patch24: poppler-20.11.0-hints.patch + BuildRequires: cmake BuildRequires: gettext-devel BuildRequires: pkgconfig(cairo) @@ -231,6 +234,11 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %{_mandir}/man1/* %changelog +* Fri Jun 17 2022 Marek Kasik - 20.11.0-5 +- Don't run out of file for Hints +- Rebuild for #2096452 +- Resolves: #2090969, #2096452 + * Thu Sep 9 2021 Marek Kasik - 20.11.0-4 - Fix opening files with streams with wrong generations - Resolves: #2002575