Compare commits
No commits in common. 'c9' and 'c8' have entirely different histories.
@ -1,2 +1,2 @@
|
||||
SOURCES/poppler-21.01.0.tar.xz
|
||||
SOURCES/poppler-test-2021-06-14.tar.xz
|
||||
SOURCES/poppler-20.11.0.tar.xz
|
||||
SOURCES/poppler-test-2009-05-13_0d2bfd4af4c76a3bac27ccaff793d9129df7b57a.tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
692697b218efd08ebaeb4ff96861a4d2ad20bdc2 SOURCES/poppler-21.01.0.tar.xz
|
||||
bd4b27622506278016668f7c5037f9e47a41abfb SOURCES/poppler-test-2021-06-14.tar.xz
|
||||
0aa751121aed6ee2220ef3ea16b9df8f9b2e81c1 SOURCES/poppler-20.11.0.tar.xz
|
||||
b58229322eb8f44a2bb1d98114b9fa3dfbef6a0a SOURCES/poppler-test-2009-05-13_0d2bfd4af4c76a3bac27ccaff793d9129df7b57a.tar.xz
|
||||
|
||||
@ -0,0 +1,205 @@
|
||||
--- poppler/glib/poppler-document.cc
|
||||
+++ poppler/glib/poppler-document.cc
|
||||
@@ -3405,6 +3405,7 @@ PopplerFormField *poppler_document_get_f
|
||||
unsigned fieldNum;
|
||||
FormPageWidgets *widgets;
|
||||
FormWidget *field;
|
||||
+ PopplerFormField *formField;
|
||||
|
||||
FormWidget::decodeID(id, &pageNum, &fieldNum);
|
||||
|
||||
@@ -3417,8 +3418,14 @@ PopplerFormField *poppler_document_get_f
|
||||
return nullptr;
|
||||
|
||||
field = widgets->getWidget(fieldNum);
|
||||
- if (field)
|
||||
- return _poppler_form_field_new(document, field);
|
||||
+ if (field) {
|
||||
+ formField = _poppler_form_field_new(document, field);
|
||||
+ delete widgets;
|
||||
+
|
||||
+ return formField;
|
||||
+ }
|
||||
+
|
||||
+ delete widgets;
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
--- poppler/poppler/CairoOutputDev.cc
|
||||
+++ poppler/poppler/CairoOutputDev.cc
|
||||
@@ -2921,8 +2921,10 @@ void CairoOutputDev::setMimeData(GfxStat
|
||||
|
||||
// colorspace in stream dict may be different from colorspace in jpx
|
||||
// data
|
||||
- if (strKind == strJPX && colorSpace)
|
||||
+ if (strKind == strJPX && colorSpace) {
|
||||
+ delete colorSpace;
|
||||
return;
|
||||
+ }
|
||||
|
||||
// only embed mime data for gray, rgb, and cmyk colorspaces.
|
||||
if (colorSpace) {
|
||||
--- poppler/poppler/TextOutputDev.cc
|
||||
+++ poppler/poppler/TextOutputDev.cc
|
||||
@@ -1619,7 +1619,6 @@ TextBlock::~TextBlock()
|
||||
|
||||
void TextBlock::addWord(TextWord *word)
|
||||
{
|
||||
- pool->addWord(word);
|
||||
if (xMin > xMax) {
|
||||
xMin = word->xMin;
|
||||
xMax = word->xMax;
|
||||
@@ -1639,6 +1638,7 @@ void TextBlock::addWord(TextWord *word)
|
||||
yMax = word->yMax;
|
||||
}
|
||||
}
|
||||
+ pool->addWord(word);
|
||||
}
|
||||
|
||||
void TextBlock::coalesce(const UnicodeMap *uMap, double fixedPitch)
|
||||
@@ -3064,11 +3064,13 @@ void TextPage::coalesce(bool physLayout,
|
||||
word0 = pool->getPool(startBaseIdx);
|
||||
pool->setPool(startBaseIdx, word0->next);
|
||||
word0->next = nullptr;
|
||||
- blk = new TextBlock(this, rot);
|
||||
- blk->addWord(word0);
|
||||
|
||||
fontSize = word0->fontSize;
|
||||
minBase = maxBase = word0->base;
|
||||
+
|
||||
+ blk = new TextBlock(this, rot);
|
||||
+ blk->addWord(word0);
|
||||
+
|
||||
colSpace1 = minColSpacing1 * fontSize;
|
||||
colSpace2 = minColSpacing2 * fontSize;
|
||||
lineSpace = maxLineSpacingDelta * fontSize;
|
||||
@@ -3095,9 +3097,9 @@ void TextPage::coalesce(bool physLayout,
|
||||
}
|
||||
word1 = word1->next;
|
||||
word2->next = nullptr;
|
||||
+ newMinBase = word2->base;
|
||||
blk->addWord(word2);
|
||||
found = true;
|
||||
- newMinBase = word2->base;
|
||||
} else {
|
||||
word0 = word1;
|
||||
word1 = word1->next;
|
||||
@@ -3123,9 +3125,9 @@ void TextPage::coalesce(bool physLayout,
|
||||
}
|
||||
word1 = word1->next;
|
||||
word2->next = nullptr;
|
||||
+ newMaxBase = word2->base;
|
||||
blk->addWord(word2);
|
||||
found = true;
|
||||
- newMaxBase = word2->base;
|
||||
} else {
|
||||
word0 = word1;
|
||||
word1 = word1->next;
|
||||
@@ -3198,12 +3200,12 @@ void TextPage::coalesce(bool physLayout,
|
||||
}
|
||||
word1 = word1->next;
|
||||
word2->next = nullptr;
|
||||
- blk->addWord(word2);
|
||||
if (word2->base < minBase) {
|
||||
minBase = word2->base;
|
||||
} else if (word2->base > maxBase) {
|
||||
maxBase = word2->base;
|
||||
}
|
||||
+ blk->addWord(word2);
|
||||
found = true;
|
||||
break;
|
||||
} else {
|
||||
@@ -3246,12 +3248,12 @@ void TextPage::coalesce(bool physLayout,
|
||||
}
|
||||
word1 = word1->next;
|
||||
word2->next = nullptr;
|
||||
- blk->addWord(word2);
|
||||
if (word2->base < minBase) {
|
||||
minBase = word2->base;
|
||||
} else if (word2->base > maxBase) {
|
||||
maxBase = word2->base;
|
||||
}
|
||||
+ blk->addWord(word2);
|
||||
found = true;
|
||||
break;
|
||||
} else {
|
||||
--- poppler/poppler/XRef.cc
|
||||
+++ poppler/poppler/XRef.cc
|
||||
@@ -402,6 +402,7 @@ int XRef::reserve(int newSize)
|
||||
|
||||
void *p = greallocn_checkoverflow(entries, realNewSize, sizeof(XRefEntry));
|
||||
if (p == nullptr) {
|
||||
+ entries = nullptr;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -835,7 +836,6 @@ bool XRef::constructXRef(bool *wasRecons
|
||||
int offset = 0;
|
||||
|
||||
resize(0); // free entries properly
|
||||
- gfree(entries);
|
||||
capacity = 0;
|
||||
size = 0;
|
||||
entries = nullptr;
|
||||
--- poppler/test/pdf-inspector.cc
|
||||
+++ poppler/test/pdf-inspector.cc
|
||||
@@ -43,6 +43,7 @@ class PdfInspector
|
||||
{
|
||||
public:
|
||||
PdfInspector();
|
||||
+ ~PdfInspector();
|
||||
|
||||
void set_file_name(const char *file_name);
|
||||
void load(const char *file_name);
|
||||
@@ -108,6 +109,11 @@ PdfInspector::PdfInspector()
|
||||
load(nullptr);
|
||||
}
|
||||
|
||||
+PdfInspector::~PdfInspector(void)
|
||||
+{
|
||||
+ delete output;
|
||||
+}
|
||||
+
|
||||
void PdfInspector::set_file_name(const char *file_name)
|
||||
{
|
||||
GtkWidget *widget;
|
||||
--- poppler/utils/HtmlOutputDev.cc
|
||||
+++ poppler/utils/HtmlOutputDev.cc
|
||||
@@ -1337,6 +1337,7 @@ void HtmlOutputDev::drawPngImage(GfxStat
|
||||
// TODO can we calculate the resolution of the image?
|
||||
if (!writer->init(f1, width, height, 72, 72)) {
|
||||
error(errInternal, -1, "Can't init PNG for image '{0:t}'", fName);
|
||||
+ delete fName;
|
||||
delete writer;
|
||||
fclose(f1);
|
||||
return;
|
||||
--- poppler/utils/pdftotext.cc
|
||||
+++ poppler/utils/pdftotext.cc
|
||||
@@ -329,6 +329,7 @@ int main(int argc, char *argv[])
|
||||
fputs("<pre>\n", f);
|
||||
if (f != stdout) {
|
||||
fclose(f);
|
||||
+ f = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -348,8 +349,9 @@ int main(int argc, char *argv[])
|
||||
printWordBBox(f, doc, textOut, firstPage, lastPage);
|
||||
}
|
||||
}
|
||||
- if (f != stdout) {
|
||||
+ if (f != stdout && f != nullptr) {
|
||||
fclose(f);
|
||||
+ f = nullptr;
|
||||
}
|
||||
} else {
|
||||
textOut = new TextOutputDev(textFileName->c_str(), physLayout, fixedPitch, rawOrder, htmlMeta, discardDiag);
|
||||
@@ -390,7 +392,7 @@ int main(int argc, char *argv[])
|
||||
fputs("</pre>\n", f);
|
||||
fputs("</body>\n", f);
|
||||
fputs("</html>\n", f);
|
||||
- if (f != stdout) {
|
||||
+ if (f != stdout && f != nullptr) {
|
||||
fclose(f);
|
||||
}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
--- poppler-0.90.0/CMakeLists.txt
|
||||
+++ poppler-0.90.0/CMakeLists.txt
|
||||
@@ -17,6 +17,9 @@ else()
|
||||
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
||||
find_package(Threads)
|
||||
endif()
|
||||
+
|
||||
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
+
|
||||
include(TestBigEndian)
|
||||
test_big_endian(WORDS_BIGENDIAN)
|
||||
include(CheckFileOffsetBits)
|
||||
@ -0,0 +1,35 @@
|
||||
From 4f478daa6a9734b8f269a6586bdce2909844bb6f Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Wed, 23 Dec 2020 23:52:58 +0100
|
||||
Subject: Fix opening files by some generators that are a bit broken
|
||||
|
||||
But Adobe opens it and it's easy to fix
|
||||
|
||||
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
|
||||
index 66d3f04a..c36c747a 100644
|
||||
--- a/poppler/XRef.cc
|
||||
+++ b/poppler/XRef.cc
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <cctype>
|
||||
#include <climits>
|
||||
#include <cfloat>
|
||||
+#include <limits>
|
||||
#include "goo/gfile.h"
|
||||
#include "goo/gmem.h"
|
||||
#include "Object.h"
|
||||
@@ -793,8 +794,13 @@ bool XRef::readXRefStreamSection(Stream *xrefStr, const int *w, int first, int n
|
||||
gen = (gen << 8) + c;
|
||||
}
|
||||
if (gen > INT_MAX) {
|
||||
- error(errSyntaxError, -1, "Gen inside xref table too large (bigger than INT_MAX)");
|
||||
- return false;
|
||||
+ if (i == 0 && gen == std::numeric_limits<uint32_t>::max()) {
|
||||
+ // workaround broken generators
|
||||
+ gen = 65535;
|
||||
+ } else {
|
||||
+ error(errSyntaxError, -1, "Gen inside xref table too large (bigger than INT_MAX)");
|
||||
+ return false;
|
||||
+ }
|
||||
}
|
||||
if (entries[i].offset == -1) {
|
||||
switch (type) {
|
||||
@ -0,0 +1,30 @@
|
||||
--- poppler-20.11.0/glib/poppler-attachment.cc
|
||||
+++ poppler-20.11.0/glib/poppler-attachment.cc
|
||||
@@ -114,17 +114,21 @@ PopplerAttachment *_poppler_attachment_n
|
||||
if (embFile->createDate()) {
|
||||
priv->ctime = _poppler_convert_pdf_date_to_date_time(embFile->createDate());
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
- /* This will overflow on dates from after 2038. This field is
|
||||
- * deprecated, only kept for backward compatibility. */
|
||||
- attachment->ctime = (GTime)g_date_time_to_unix(priv->ctime);
|
||||
+ if (priv->ctime != NULL) {
|
||||
+ /* This will overflow on dates from after 2038. This field is
|
||||
+ * deprecated, only kept for backward compatibility. */
|
||||
+ attachment->ctime = (GTime)g_date_time_to_unix(priv->ctime);
|
||||
+ }
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
}
|
||||
if (embFile->modDate()) {
|
||||
priv->mtime = _poppler_convert_pdf_date_to_date_time(embFile->modDate());
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
- /* This will overflow on dates from after 2038. This field is
|
||||
- * deprecated, only kept for backward compatibility. */
|
||||
- attachment->mtime = (GTime)g_date_time_to_unix(priv->mtime);
|
||||
+ if (priv->mtime != NULL) {
|
||||
+ /* This will overflow on dates from after 2038. This field is
|
||||
+ * deprecated, only kept for backward compatibility. */
|
||||
+ attachment->mtime = (GTime)g_date_time_to_unix(priv->mtime);
|
||||
+ }
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
}
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
From 3cc28b66132e66ed2dfe13a9a285ac41ac7267d5 Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Wed, 23 Dec 2020 23:27:02 +0100
|
||||
Subject: [PATCH] FoFiType1C: Fix crashes with broken files
|
||||
|
||||
---
|
||||
fofi/FoFiType1C.cc | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/fofi/FoFiType1C.cc b/fofi/FoFiType1C.cc
|
||||
index 0387b0a87..4c2e9a770 100644
|
||||
--- a/fofi/FoFiType1C.cc
|
||||
+++ b/fofi/FoFiType1C.cc
|
||||
@@ -194,7 +194,6 @@ void FoFiType1C::convertToType1(const char *psName, const char **newEncoding, bo
|
||||
Type1CIndexVal val;
|
||||
GooString *buf;
|
||||
char buf2[256];
|
||||
- const char **enc;
|
||||
bool ok;
|
||||
int i;
|
||||
|
||||
@@ -299,9 +298,9 @@ void FoFiType1C::convertToType1(const char *psName, const char **newEncoding, bo
|
||||
} else {
|
||||
(*outputFunc)(outputStream, "256 array\n", 10);
|
||||
(*outputFunc)(outputStream, "0 1 255 {1 index exch /.notdef put} for\n", 40);
|
||||
- enc = newEncoding ? newEncoding : (const char **)encoding;
|
||||
+ const char **enc = newEncoding ? newEncoding : (const char **)encoding;
|
||||
for (i = 0; i < 256; ++i) {
|
||||
- if (enc[i]) {
|
||||
+ if (enc && enc[i]) {
|
||||
buf = GooString::format("dup {0:d} /{1:s} put\n", i, enc[i]);
|
||||
(*outputFunc)(outputStream, buf->c_str(), buf->getLength());
|
||||
delete buf;
|
||||
@@ -1945,7 +1944,7 @@ bool FoFiType1C::parse()
|
||||
readPrivateDict(0, 0, &privateDicts[0]);
|
||||
} else {
|
||||
getIndex(topDict.fdArrayOffset, &fdIdx, &parsedOk);
|
||||
- if (!parsedOk) {
|
||||
+ if (!parsedOk || fdIdx.len <= 0) {
|
||||
return false;
|
||||
}
|
||||
nFDs = fdIdx.len;
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -0,0 +1,110 @@
|
||||
From 0554731052d1a97745cb179ab0d45620589dd9c4 Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Fri, 7 Jun 2024 00:54:55 +0200
|
||||
Subject: pdfinfo: Fix crash in broken documents when using -dests
|
||||
|
||||
Modified by Marek Kasik due to the backport.
|
||||
|
||||
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
|
||||
index 5d37ef64..7d569749 100644
|
||||
--- a/utils/pdfinfo.cc
|
||||
+++ b/utils/pdfinfo.cc
|
||||
@@ -15,7 +15,7 @@
|
||||
// under GPL version 2 or later
|
||||
//
|
||||
// Copyright (C) 2006 Dom Lachowicz <cinamod@hotmail.com>
|
||||
-// Copyright (C) 2007-2010, 2012, 2016-2020 Albert Astals Cid <aacid@kde.org>
|
||||
+// Copyright (C) 2007-2010, 2012, 2016-2020, 2024 Albert Astals Cid <aacid@kde.org>
|
||||
// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
|
||||
// Copyright (C) 2011 Vittal Aithal <vittal.aithal@cognidox.com>
|
||||
// Copyright (C) 2012, 2013, 2016-2018 Adrian Johnson <ajohnson@redneon.com>
|
||||
@@ -107,6 +107,23 @@ static const ArgDesc argDesc[] = { { "-f
|
||||
{ "-?", argFlag, &printHelp, 0, "print usage information" },
|
||||
{} };
|
||||
|
||||
+static void printStdTextString(const std::string &s, const UnicodeMap *uMap)
|
||||
+{
|
||||
+ char buf[8];
|
||||
+ Unicode *u;
|
||||
+ int i, len;
|
||||
+ GooString *s1 = new GooString(s);
|
||||
+
|
||||
+ if (s1 != nullptr) {
|
||||
+ len = TextStringToUCS4(s1, &u);
|
||||
+ for (i = 0; i < len; i++) {
|
||||
+ int n = uMap->mapUnicode(u[i], buf, sizeof(buf));
|
||||
+ fwrite(buf, 1, n, stdout);
|
||||
+ }
|
||||
+ delete s1;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static void printInfoString(Dict *infoDict, const char *key, const char *text, const UnicodeMap *uMap)
|
||||
{
|
||||
const GooString *s1;
|
||||
@@ -278,11 +295,6 @@ static void printStruct(const StructElem
|
||||
}
|
||||
}
|
||||
|
||||
-struct GooStringCompare
|
||||
-{
|
||||
- bool operator()(GooString *lhs, GooString *rhs) const { return lhs->cmp(const_cast<GooString *>(rhs)) < 0; }
|
||||
-};
|
||||
-
|
||||
static void printLinkDest(const std::unique_ptr<LinkDest> &dest)
|
||||
{
|
||||
GooString s;
|
||||
@@ -353,29 +365,25 @@ static void printLinkDest(const std::uni
|
||||
|
||||
static void printDestinations(PDFDoc *doc, const UnicodeMap *uMap)
|
||||
{
|
||||
- std::map<Ref, std::map<GooString *, std::unique_ptr<LinkDest>, GooStringCompare>> map;
|
||||
+ std::map<Ref, std::map<std::string, std::unique_ptr<LinkDest>>> map;
|
||||
|
||||
int numDests = doc->getCatalog()->numDestNameTree();
|
||||
for (int i = 0; i < numDests; i++) {
|
||||
- GooString *name = new GooString(doc->getCatalog()->getDestNameTreeName(i));
|
||||
+ const GooString *name = doc->getCatalog()->getDestNameTreeName(i);
|
||||
std::unique_ptr<LinkDest> dest = doc->getCatalog()->getDestNameTreeDest(i);
|
||||
- if (dest && dest->isPageRef()) {
|
||||
+ if (name && dest && dest->isPageRef()) {
|
||||
Ref pageRef = dest->getPageRef();
|
||||
- map[pageRef].insert(std::make_pair(name, std::move(dest)));
|
||||
- } else {
|
||||
- delete name;
|
||||
+ map[pageRef].insert(std::make_pair(name->toStr(), std::move(dest)));
|
||||
}
|
||||
}
|
||||
|
||||
numDests = doc->getCatalog()->numDests();
|
||||
for (int i = 0; i < numDests; i++) {
|
||||
- GooString *name = new GooString(doc->getCatalog()->getDestsName(i));
|
||||
+ const char *name = doc->getCatalog()->getDestsName(i);
|
||||
std::unique_ptr<LinkDest> dest = doc->getCatalog()->getDestsDest(i);
|
||||
- if (dest && dest->isPageRef()) {
|
||||
+ if (name && dest && dest->isPageRef()) {
|
||||
Ref pageRef = dest->getPageRef();
|
||||
map[pageRef].insert(std::make_pair(name, std::move(dest)));
|
||||
- } else {
|
||||
- delete name;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -389,16 +397,8 @@ static void printDestinations(PDFDoc *do
|
||||
printf("%4d ", i);
|
||||
printLinkDest(it.second);
|
||||
printf(" \"");
|
||||
- Unicode *u;
|
||||
- char buf[8];
|
||||
- const int len = TextStringToUCS4(it.first, &u);
|
||||
- for (int j = 0; j < len; j++) {
|
||||
- const int n = uMap->mapUnicode(u[j], buf, sizeof(buf));
|
||||
- fwrite(buf, 1, n, stdout);
|
||||
- }
|
||||
- gfree(u);
|
||||
+ printStdTextString(it.first, uMap);
|
||||
printf("\"\n");
|
||||
- delete it.first;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,439 +0,0 @@
|
||||
--- poppler/glib/poppler-document.cc
|
||||
+++ poppler/glib/poppler-document.cc
|
||||
@@ -869,12 +869,12 @@ GTree *poppler_document_create_dests_tre
|
||||
// Iterate from name-dict
|
||||
const int nDests = catalog->numDests();
|
||||
for (i = 0; i < nDests; ++i) {
|
||||
- // The names of name-dict cannot contain \0,
|
||||
- // so we can use strlen().
|
||||
- auto name = catalog->getDestsName(i);
|
||||
- key = poppler_named_dest_from_bytestring(reinterpret_cast<const guint8 *>(name), strlen(name));
|
||||
std::unique_ptr<LinkDest> link_dest = catalog->getDestsDest(i);
|
||||
if (link_dest) {
|
||||
+ // The names of name-dict cannot contain \0,
|
||||
+ // so we can use strlen().
|
||||
+ auto name = catalog->getDestsName(i);
|
||||
+ key = poppler_named_dest_from_bytestring(reinterpret_cast<const guint8 *>(name), strlen(name));
|
||||
dest = _poppler_dest_new_goto(document, link_dest.get());
|
||||
g_tree_insert(tree, key, dest);
|
||||
}
|
||||
@@ -883,10 +883,10 @@ GTree *poppler_document_create_dests_tre
|
||||
// Iterate form name-tree
|
||||
const int nDestsNameTree = catalog->numDestNameTree();
|
||||
for (i = 0; i < nDestsNameTree; ++i) {
|
||||
- auto name = catalog->getDestNameTreeName(i);
|
||||
- key = poppler_named_dest_from_bytestring(reinterpret_cast<const guint8 *>(name->c_str()), name->getLength());
|
||||
std::unique_ptr<LinkDest> link_dest = catalog->getDestNameTreeDest(i);
|
||||
if (link_dest) {
|
||||
+ auto name = catalog->getDestNameTreeName(i);
|
||||
+ key = poppler_named_dest_from_bytestring(reinterpret_cast<const guint8 *>(name->c_str()), name->getLength());
|
||||
dest = _poppler_dest_new_goto(document, link_dest.get());
|
||||
g_tree_insert(tree, key, dest);
|
||||
}
|
||||
@@ -3405,6 +3405,7 @@ PopplerFormField *poppler_document_get_f
|
||||
unsigned fieldNum;
|
||||
FormPageWidgets *widgets;
|
||||
FormWidget *field;
|
||||
+ PopplerFormField *formField;
|
||||
|
||||
FormWidget::decodeID(id, &pageNum, &fieldNum);
|
||||
|
||||
@@ -3417,8 +3418,14 @@ PopplerFormField *poppler_document_get_f
|
||||
return nullptr;
|
||||
|
||||
field = widgets->getWidget(fieldNum);
|
||||
- if (field)
|
||||
- return _poppler_form_field_new(document, field);
|
||||
+ if (field) {
|
||||
+ formField = _poppler_form_field_new(document, field);
|
||||
+ delete widgets;
|
||||
+
|
||||
+ return formField;
|
||||
+ }
|
||||
+
|
||||
+ delete widgets;
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
--- poppler-21.01.0/glib/poppler-page.cc
|
||||
+++ poppler-21.01.0/glib/poppler-page.cc
|
||||
@@ -1530,15 +1530,18 @@ void poppler_page_add_annot(PopplerPage
|
||||
* first remove cropbox of the prior page before adding cropbox of the new page later */
|
||||
quads = new_quads_from_offset_cropbox(crop_box, annot_markup->getQuadrilaterals(), FALSE);
|
||||
annot_markup->setQuadrilaterals(quads);
|
||||
+ delete quads;
|
||||
}
|
||||
if (page_is_rotated) {
|
||||
/* Quadrilateral's coords need to be saved un-rotated (same as rect coords) */
|
||||
quads = _page_new_quads_unrotated(page->page, annot_markup->getQuadrilaterals());
|
||||
annot_markup->setQuadrilaterals(quads);
|
||||
+ delete quads;
|
||||
}
|
||||
/* Add to annot's quadrilaterals the offset for the cropbox of the new page */
|
||||
quads = new_quads_from_offset_cropbox(page_crop_box, annot_markup->getQuadrilaterals(), TRUE);
|
||||
annot_markup->setQuadrilaterals(quads);
|
||||
+ delete quads;
|
||||
}
|
||||
|
||||
page->page->addAnnot(annot->annot);
|
||||
--- poppler-21.01.0/glib/poppler-structure-element.cc
|
||||
+++ poppler-21.01.0/glib/poppler-structure-element.cc
|
||||
@@ -1090,6 +1090,8 @@ static inline void convert_doubles_array
|
||||
for (guint i = 0; i < *n_values; i++) {
|
||||
doubles[i] = object->arrayGet(i).getNum();
|
||||
}
|
||||
+
|
||||
+ values = &doubles;
|
||||
}
|
||||
|
||||
static inline void convert_color(Object *object, PopplerColor *color)
|
||||
--- poppler-21.01.0/poppler/Form.cc
|
||||
+++ poppler-21.01.0/poppler/Form.cc
|
||||
@@ -549,6 +549,7 @@ bool FormWidgetSignature::signDocument(c
|
||||
GooString *fname = new GooString(saveFilename);
|
||||
if (doc->saveAs(fname, writeForceIncremental) != errNone) {
|
||||
fprintf(stderr, "signDocument: error saving to file \"%s\"\n", saveFilename);
|
||||
+ delete fname;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -563,6 +564,8 @@ bool FormWidgetSignature::signDocument(c
|
||||
FILE *file = openFile(saveFilename, "r+b");
|
||||
if (!updateOffsets(file, objStart, objEnd, &sigStart, &sigEnd, &fileSize)) {
|
||||
fprintf(stderr, "signDocument: unable update byte range\n");
|
||||
+ delete fname;
|
||||
+ fclose(file);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -574,15 +577,21 @@ bool FormWidgetSignature::signDocument(c
|
||||
// and sign it
|
||||
const std::unique_ptr<GooString> signature = sigHandler.signDetached(password);
|
||||
- if (!signature)
|
||||
+ if (!signature) {
|
||||
+ delete fname;
|
||||
+ fclose(file);
|
||||
return false;
|
||||
+ }
|
||||
|
||||
// write signature to saved file
|
||||
if (!updateSignature(file, sigStart, sigEnd, signature.get())) {
|
||||
fprintf(stderr, "signDocument: unable update signature\n");
|
||||
+ delete fname;
|
||||
+ fclose(file);
|
||||
return false;
|
||||
}
|
||||
signatureField->setSignature(*signature);
|
||||
|
||||
+ delete fname;
|
||||
fclose(file);
|
||||
|
||||
return true;
|
||||
@@ -662,22 +670,30 @@ bool FormWidgetSignature::updateOffsets(
|
||||
}
|
||||
}
|
||||
|
||||
- if (*sigStart == -1 || *sigEnd == -1)
|
||||
+ if (*sigStart == -1 || *sigEnd == -1) {
|
||||
+ free(buf);
|
||||
return false;
|
||||
+ }
|
||||
|
||||
// Search for ByteRange array and update offsets
|
||||
for (int i = 0; i < bufSize - 10; i++) {
|
||||
if (buf[i] == '/' && strncmp(&buf[i], "/ByteRange", 10) == 0) {
|
||||
// update range
|
||||
char *p = setNextOffset(&buf[i], *sigStart);
|
||||
- if (!p)
|
||||
+ if (!p) {
|
||||
+ free(buf);
|
||||
return false;
|
||||
+ }
|
||||
p = setNextOffset(p, *sigEnd);
|
||||
- if (!p)
|
||||
+ if (!p) {
|
||||
+ free(buf);
|
||||
return false;
|
||||
+ }
|
||||
p = setNextOffset(p, *fileSize - *sigEnd);
|
||||
- if (!p)
|
||||
+ if (!p) {
|
||||
+ free(buf);
|
||||
return false;
|
||||
+ }
|
||||
break;
|
||||
}
|
||||
}
|
||||
--- poppler-21.01.0/poppler/JBIG2Stream.cc
|
||||
+++ poppler-21.01.0/poppler/JBIG2Stream.cc
|
||||
@@ -2834,6 +2834,8 @@ JBIG2Bitmap *JBIG2Stream::readGenericBit
|
||||
|
||||
if (unlikely(!codingLine || !refLine)) {
|
||||
error(errSyntaxError, curStr->getPos(), "Bad width in JBIG2 generic bitmap");
|
||||
+ gfree(refLine);
|
||||
+ gfree(codingLine);
|
||||
delete bitmap;
|
||||
return nullptr;
|
||||
}
|
||||
--- poppler-21.01.0/poppler/Lexer.cc
|
||||
+++ poppler-21.01.0/poppler/Lexer.cc
|
||||
@@ -461,6 +461,7 @@ Object Lexer::getObj(int objNum)
|
||||
} else if (n == tokBufSize) {
|
||||
error(errSyntaxError, getPos(), "Warning: name token is longer than what the specification says it can be");
|
||||
*p = c;
|
||||
+ delete s;
|
||||
s = new GooString(tokBuf, n);
|
||||
} else {
|
||||
s->append((char)c);
|
||||
@@ -468,6 +468,7 @@ Object Lexer::getObj(int objNum)
|
||||
}
|
||||
if (n < tokBufSize) {
|
||||
*p = '\0';
|
||||
+ delete s;
|
||||
return Object(objName, tokBuf);
|
||||
} else {
|
||||
Object obj(objName, s->c_str());
|
||||
--- poppler/poppler/CairoOutputDev.cc
|
||||
+++ poppler/poppler/CairoOutputDev.cc
|
||||
@@ -2921,8 +2921,10 @@ void CairoOutputDev::setMimeData(GfxStat
|
||||
|
||||
// colorspace in stream dict may be different from colorspace in jpx
|
||||
// data
|
||||
- if (strKind == strJPX && colorSpace)
|
||||
+ if (strKind == strJPX && colorSpace) {
|
||||
+ delete colorSpace;
|
||||
return;
|
||||
+ }
|
||||
|
||||
// only embed mime data for gray, rgb, and cmyk colorspaces.
|
||||
if (colorSpace) {
|
||||
--- poppler/poppler/TextOutputDev.cc
|
||||
+++ poppler/poppler/TextOutputDev.cc
|
||||
@@ -20,7 +20,7 @@
|
||||
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
|
||||
// Copyright (C) 2007, 2008, 2012, 2017 Adrian Johnson <ajohnson@redneon.com>
|
||||
// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
|
||||
-// Copyright (C) 2008, 2010-2012, 2014-2020 Albert Astals Cid <aacid@kde.org>
|
||||
+// Copyright (C) 2008, 2010-2012, 2014-2021 Albert Astals Cid <aacid@kde.org>
|
||||
// Copyright (C) 2008 Pino Toscano <pino@kde.org>
|
||||
// Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
|
||||
// Copyright (C) 2009 Ross Moore <ross@maths.mq.edu.au>
|
||||
@@ -1619,7 +1619,6 @@ TextBlock::~TextBlock()
|
||||
|
||||
void TextBlock::addWord(TextWord *word)
|
||||
{
|
||||
- pool->addWord(word);
|
||||
if (xMin > xMax) {
|
||||
xMin = word->xMin;
|
||||
xMax = word->xMax;
|
||||
@@ -1639,6 +1638,7 @@ void TextBlock::addWord(TextWord *word)
|
||||
yMax = word->yMax;
|
||||
}
|
||||
}
|
||||
+ pool->addWord(word);
|
||||
}
|
||||
|
||||
void TextBlock::coalesce(const UnicodeMap *uMap, double fixedPitch)
|
||||
@@ -3064,11 +3064,13 @@ void TextPage::coalesce(bool physLayout,
|
||||
word0 = pool->getPool(startBaseIdx);
|
||||
pool->setPool(startBaseIdx, word0->next);
|
||||
word0->next = nullptr;
|
||||
- blk = new TextBlock(this, rot);
|
||||
- blk->addWord(word0);
|
||||
|
||||
fontSize = word0->fontSize;
|
||||
minBase = maxBase = word0->base;
|
||||
+
|
||||
+ blk = new TextBlock(this, rot);
|
||||
+ blk->addWord(word0);
|
||||
+
|
||||
colSpace1 = minColSpacing1 * fontSize;
|
||||
colSpace2 = minColSpacing2 * fontSize;
|
||||
lineSpace = maxLineSpacingDelta * fontSize;
|
||||
@@ -3095,9 +3097,9 @@ void TextPage::coalesce(bool physLayout,
|
||||
}
|
||||
word1 = word1->next;
|
||||
word2->next = nullptr;
|
||||
+ newMinBase = word2->base;
|
||||
blk->addWord(word2);
|
||||
found = true;
|
||||
- newMinBase = word2->base;
|
||||
} else {
|
||||
word0 = word1;
|
||||
word1 = word1->next;
|
||||
@@ -3123,9 +3125,9 @@ void TextPage::coalesce(bool physLayout,
|
||||
}
|
||||
word1 = word1->next;
|
||||
word2->next = nullptr;
|
||||
+ newMaxBase = word2->base;
|
||||
blk->addWord(word2);
|
||||
found = true;
|
||||
- newMaxBase = word2->base;
|
||||
} else {
|
||||
word0 = word1;
|
||||
word1 = word1->next;
|
||||
@@ -3198,12 +3200,12 @@ void TextPage::coalesce(bool physLayout,
|
||||
}
|
||||
word1 = word1->next;
|
||||
word2->next = nullptr;
|
||||
- blk->addWord(word2);
|
||||
if (word2->base < minBase) {
|
||||
minBase = word2->base;
|
||||
} else if (word2->base > maxBase) {
|
||||
maxBase = word2->base;
|
||||
}
|
||||
+ blk->addWord(word2);
|
||||
found = true;
|
||||
break;
|
||||
} else {
|
||||
@@ -3246,12 +3248,12 @@ void TextPage::coalesce(bool physLayout,
|
||||
}
|
||||
word1 = word1->next;
|
||||
word2->next = nullptr;
|
||||
- blk->addWord(word2);
|
||||
if (word2->base < minBase) {
|
||||
minBase = word2->base;
|
||||
} else if (word2->base > maxBase) {
|
||||
maxBase = word2->base;
|
||||
}
|
||||
+ blk->addWord(word2);
|
||||
found = true;
|
||||
break;
|
||||
} else {
|
||||
@@ -4456,13 +4456,18 @@ class TextSelectionSizer : public TextSe
|
||||
{
|
||||
public:
|
||||
TextSelectionSizer(TextPage *page, double scale);
|
||||
- ~TextSelectionSizer() override { }
|
||||
+ ~TextSelectionSizer() override { delete list; }
|
||||
|
||||
void visitBlock(TextBlock *block, TextLine *begin, TextLine *end, const PDFRectangle *selection) override {};
|
||||
void visitLine(TextLine *line, TextWord *begin, TextWord *end, int edge_begin, int edge_end, const PDFRectangle *selection) override;
|
||||
void visitWord(TextWord *word, int begin, int end, const PDFRectangle *selection) override {};
|
||||
|
||||
- std::vector<PDFRectangle *> *getRegion() { return list; }
|
||||
+ std::vector<PDFRectangle *> *takeRegion()
|
||||
+ {
|
||||
+ auto aux = list;
|
||||
+ list = nullptr;
|
||||
+ return aux;
|
||||
+ }
|
||||
|
||||
private:
|
||||
std::vector<PDFRectangle *> *list;
|
||||
@@ -5063,7 +5068,7 @@ std::vector<PDFRectangle *> *TextPage::g
|
||||
|
||||
visitSelection(&sizer, selection, style);
|
||||
|
||||
- return sizer.getRegion();
|
||||
+ return sizer.takeRegion();
|
||||
}
|
||||
|
||||
GooString *TextPage::getSelectionText(const PDFRectangle *selection, SelectionStyle style)
|
||||
--- poppler/poppler/XRef.cc
|
||||
+++ poppler/poppler/XRef.cc
|
||||
@@ -402,6 +402,7 @@ int XRef::reserve(int newSize)
|
||||
|
||||
void *p = greallocn_checkoverflow(entries, realNewSize, sizeof(XRefEntry));
|
||||
if (p == nullptr) {
|
||||
+ entries = nullptr;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -835,7 +836,6 @@ bool XRef::constructXRef(bool *wasRecons
|
||||
int offset = 0;
|
||||
|
||||
resize(0); // free entries properly
|
||||
- gfree(entries);
|
||||
capacity = 0;
|
||||
size = 0;
|
||||
entries = nullptr;
|
||||
--- poppler/test/pdf-inspector.cc
|
||||
+++ poppler/test/pdf-inspector.cc
|
||||
@@ -43,6 +43,7 @@ class PdfInspector
|
||||
{
|
||||
public:
|
||||
PdfInspector();
|
||||
+ ~PdfInspector();
|
||||
|
||||
void set_file_name(const char *file_name);
|
||||
void load(const char *file_name);
|
||||
@@ -108,6 +109,11 @@ PdfInspector::PdfInspector()
|
||||
load(nullptr);
|
||||
}
|
||||
|
||||
+PdfInspector::~PdfInspector(void)
|
||||
+{
|
||||
+ delete output;
|
||||
+}
|
||||
+
|
||||
void PdfInspector::set_file_name(const char *file_name)
|
||||
{
|
||||
GtkWidget *widget;
|
||||
--- poppler/utils/HtmlOutputDev.cc
|
||||
+++ poppler/utils/HtmlOutputDev.cc
|
||||
@@ -1337,6 +1337,7 @@ void HtmlOutputDev::drawPngImage(GfxStat
|
||||
// TODO can we calculate the resolution of the image?
|
||||
if (!writer->init(f1, width, height, 72, 72)) {
|
||||
error(errInternal, -1, "Can't init PNG for image '{0:t}'", fName);
|
||||
+ delete fName;
|
||||
delete writer;
|
||||
fclose(f1);
|
||||
return;
|
||||
@@ -1378,6 +1378,7 @@ void HtmlOutputDev::drawPngImage(GfxStat
|
||||
|
||||
if (!writer->writeRow(row_pointer)) {
|
||||
error(errIO, -1, "Failed to write into PNG '{0:t}'", fName);
|
||||
+ delete fName;
|
||||
delete writer;
|
||||
delete imgStr;
|
||||
fclose(f1);
|
||||
@@ -1413,6 +1414,7 @@ void HtmlOutputDev::drawPngImage(GfxStat
|
||||
|
||||
if (!writer->writeRow(&png_row)) {
|
||||
error(errIO, -1, "Failed to write into PNG '{0:t}'", fName);
|
||||
+ delete fName;
|
||||
delete writer;
|
||||
fclose(f1);
|
||||
gfree(png_row);
|
||||
--- poppler/utils/pdftotext.cc
|
||||
+++ poppler/utils/pdftotext.cc
|
||||
@@ -329,6 +329,7 @@ int main(int argc, char *argv[])
|
||||
fputs("<pre>\n", f);
|
||||
if (f != stdout) {
|
||||
fclose(f);
|
||||
+ f = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -348,8 +349,9 @@ int main(int argc, char *argv[])
|
||||
printWordBBox(f, doc, textOut, firstPage, lastPage);
|
||||
}
|
||||
}
|
||||
- if (f != stdout) {
|
||||
+ if (f != stdout && f != nullptr) {
|
||||
fclose(f);
|
||||
+ f = nullptr;
|
||||
}
|
||||
} else {
|
||||
textOut = new TextOutputDev(textFileName->c_str(), physLayout, fixedPitch, rawOrder, htmlMeta, discardDiag);
|
||||
@@ -390,7 +392,7 @@ int main(int argc, char *argv[])
|
||||
fputs("</pre>\n", f);
|
||||
fputs("</body>\n", f);
|
||||
fputs("</html>\n", f);
|
||||
- if (f != stdout) {
|
||||
+ if (f != stdout && f != nullptr) {
|
||||
fclose(f);
|
||||
}
|
||||
}
|
||||
@@ -533,7 +533,9 @@ void printWordBBox(FILE *f, PDFDoc *doc,
|
||||
for (int i = 0; i < word_length; ++i) {
|
||||
word = wordlist->get(i);
|
||||
word->getBBox(&xMinA, &yMinA, &xMaxA, &yMaxA);
|
||||
- const std::string myString = myXmlTokenReplace(word->getText()->c_str());
|
||||
+ GooString *wordText = word->getText();
|
||||
+ const std::string myString = myXmlTokenReplace(wordText->c_str());
|
||||
+ delete wordText;
|
||||
fprintf(f, " <word xMin=\"%f\" yMin=\"%f\" xMax=\"%f\" yMax=\"%f\">%s</word>\n", xMinA, yMinA, xMaxA, yMaxA, myString.c_str());
|
||||
}
|
||||
fprintf(f, " </page>\n");
|
||||
@ -1,11 +0,0 @@
|
||||
--- poppler-21.01.0/glib/CMakeLists.txt
|
||||
+++ poppler-21.01.0/glib/CMakeLists.txt
|
||||
@@ -121,7 +121,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_
|
||||
|
||||
# General gir: Reset object-list for introspection & load tool args
|
||||
set(INTROSPECTION_GIRS)
|
||||
- set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all")
|
||||
+ set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all" "--sources-top-dirs=${CMAKE_SOURCE_DIR}" "--sources-top-dirs=${CMAKE_BINARY_DIR}")
|
||||
set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
# Poppler: Assign package to gir & export keys
|
||||
@ -1,28 +0,0 @@
|
||||
From 5dbe101b7c3561aedf33872e218b8d1b6984f623 Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Sat, 8 May 2021 00:54:13 +0200
|
||||
Subject: [PATCH] Restore setting the Encoding in createAnnotDrawFont
|
||||
|
||||
It was removed in 9db685f379c1c9195b5f0c9a693e7a581e6b214f and as far as
|
||||
i remember the reason was that signatures created with that hung Adobe
|
||||
Reader, but I can't reproduce it anymore and on top of that is causing
|
||||
regressions when rendering PDF files (Issue #1070) so restore it.
|
||||
---
|
||||
poppler/Annot.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
|
||||
index 5287b4dc..40b1085a 100644
|
||||
--- a/poppler/Annot.cc
|
||||
+++ b/poppler/Annot.cc
|
||||
@@ -2852,6 +2852,7 @@ static GfxFont *createAnnotDrawFont(XRef *xref, Dict *fontParentDict, const char
|
||||
Dict *fontDict = new Dict(xref);
|
||||
fontDict->add("BaseFont", Object(objName, fontname));
|
||||
fontDict->add("Subtype", Object(objName, "Type1"));
|
||||
+ fontDict->add("Encoding", Object(objName, "WinAnsiEncoding"));
|
||||
|
||||
Object fontsDictObj = fontParentDict->lookup("Font");
|
||||
if (!fontsDictObj.isDict()) {
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
diff --git a/glib/poppler-enums.c.template b/glib/poppler-enums.c.template
|
||||
index 26a51b4..27be2b9 100644
|
||||
--- a/glib/poppler-enums.c.template
|
||||
+++ b/glib/poppler-enums.c.template
|
||||
@@ -15,7 +15,7 @@
|
||||
GType
|
||||
@enum_name@_get_type (void)
|
||||
{
|
||||
- static volatile gsize g_define_type_id__volatile = 0;
|
||||
+ static gsize g_define_type_id__volatile = 0;
|
||||
|
||||
if (g_once_init_enter (&g_define_type_id__volatile)) {
|
||||
static const G@Type@Value values[] = {
|
||||
|
||||
diff --git a/glib/poppler-private.h b/glib/poppler-private.h
|
||||
index 7726ec7..436bca5 100644
|
||||
--- a/glib/poppler-private.h
|
||||
+++ b/glib/poppler-private.h
|
||||
@@ -167,7 +167,7 @@ gboolean _poppler_convert_pdf_date_to_gtime (const GooString *date,
|
||||
#define POPPLER_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) \
|
||||
GType type_name##_get_type(void) \
|
||||
{ \
|
||||
- static volatile gsize g_define_type_id__volatile = 0; \
|
||||
+ static gsize g_define_type_id__volatile = 0; \
|
||||
if (g_once_init_enter(&g_define_type_id__volatile)) { \
|
||||
GType g_define_type_id = g_boxed_type_register_static(g_intern_static_string(#TypeName), (GBoxedCopyFunc)copy_func, (GBoxedFreeFunc)free_func); \
|
||||
g_once_init_leave(&g_define_type_id__volatile, g_define_type_id); \
|
||||
Loading…
Reference in new issue