|
 |
26ed26 |
From 81044c64b9ed9a10ae82a28bac753060bdfdac74 Mon Sep 17 00:00:00 2001
|
|
|
26ed26 |
From: Albert Astals Cid <aacid@kde.org>
|
|
|
26ed26 |
Date: Tue, 15 Mar 2022 15:14:32 +0100
|
|
|
26ed26 |
Subject: Hints::readTables: bail out if we run out of file when reading
|
|
|
26ed26 |
|
|
|
26ed26 |
Fixes #1230
|
|
|
26ed26 |
|
|
|
26ed26 |
diff --git a/poppler/Hints.cc b/poppler/Hints.cc
|
|
|
26ed26 |
index 79f04088..4707e1c6 100644
|
|
|
26ed26 |
--- a/poppler/Hints.cc
|
|
|
26ed26 |
+++ b/poppler/Hints.cc
|
|
|
26ed26 |
@@ -5,7 +5,7 @@
|
|
|
26ed26 |
// This file is licensed under the GPLv2 or later
|
|
|
26ed26 |
//
|
|
|
26ed26 |
// Copyright 2010, 2012 Hib Eris <hib@hiberis.nl>
|
|
|
26ed26 |
-// Copyright 2010, 2011, 2013, 2014, 2016-2019 Albert Astals Cid <aacid@kde.org>
|
|
|
26ed26 |
+// Copyright 2010, 2011, 2013, 2014, 2016-2019, 2021, 2022 Albert Astals Cid <aacid@kde.org>
|
|
|
26ed26 |
// Copyright 2010, 2013 Pino Toscano <pino@kde.org>
|
|
|
26ed26 |
// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
|
|
|
26ed26 |
// Copyright 2014 Fabio D'Urso <fabiodurso@hotmail.it>
|
|
|
26ed26 |
@@ -189,21 +189,31 @@ void Hints::readTables(BaseStream *str, Linearization *linearization, XRef *xref
|
|
|
26ed26 |
char *p = &buf[0];
|
|
|
26ed26 |
|
|
|
26ed26 |
if (hintsOffset && hintsLength) {
|
|
|
26ed26 |
- Stream *s = str->makeSubStream(hintsOffset, false, hintsLength, Object(objNull));
|
|
|
26ed26 |
+ std::unique_ptr<Stream> s(str->makeSubStream(hintsOffset, false, hintsLength, Object(objNull)));
|
|
|
26ed26 |
s->reset();
|
|
|
26ed26 |
for (unsigned int i = 0; i < hintsLength; i++) {
|
|
|
26ed26 |
- *p++ = s->getChar();
|
|
|
26ed26 |
+ const int c = s->getChar();
|
|
|
26ed26 |
+ if (unlikely(c == EOF)) {
|
|
|
26ed26 |
+ error(errSyntaxWarning, -1, "Found EOF while reading hints");
|
|
|
26ed26 |
+ ok = false;
|
|
|
26ed26 |
+ return;
|
|
|
26ed26 |
+ }
|
|
|
26ed26 |
+ *p++ = c;
|
|
|
26ed26 |
}
|
|
|
26ed26 |
- delete s;
|
|
|
26ed26 |
}
|
|
|
26ed26 |
|
|
|
26ed26 |
if (hintsOffset2 && hintsLength2) {
|
|
|
26ed26 |
- Stream *s = str->makeSubStream(hintsOffset2, false, hintsLength2, Object(objNull));
|
|
|
26ed26 |
+ std::unique_ptr<Stream> s(str->makeSubStream(hintsOffset2, false, hintsLength2, Object(objNull)));
|
|
|
26ed26 |
s->reset();
|
|
|
26ed26 |
for (unsigned int i = 0; i < hintsLength2; i++) {
|
|
|
26ed26 |
- *p++ = s->getChar();
|
|
|
26ed26 |
+ const int c = s->getChar();
|
|
|
26ed26 |
+ if (unlikely(c == EOF)) {
|
|
|
26ed26 |
+ error(errSyntaxWarning, -1, "Found EOF while reading hints2");
|
|
|
26ed26 |
+ ok = false;
|
|
|
26ed26 |
+ return;
|
|
|
26ed26 |
+ }
|
|
|
26ed26 |
+ *p++ = c;
|
|
|
26ed26 |
}
|
|
|
26ed26 |
- delete s;
|
|
|
26ed26 |
}
|
|
|
26ed26 |
|
|
|
26ed26 |
MemStream *memStream = new MemStream(&buf[0], 0, bufLength, Object(objNull));
|