Move the fileSpec.dictLookup call inside fileSpec.isDict if
Resolves: #1665264
This commit is contained in:
parent
d39b5b6968
commit
baf82ae805
35
poppler-0.67.0-filespec.patch
Normal file
35
poppler-0.67.0-filespec.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From de0c0b8324e776f0b851485e0fc9622fc35695b7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Albert Astals Cid <aacid@kde.org>
|
||||||
|
Date: Sat, 29 Dec 2018 01:25:17 +0100
|
||||||
|
Subject: [PATCH] FileSpec: Move the fileSpec.dictLookup call inside
|
||||||
|
fileSpec.isDict if
|
||||||
|
|
||||||
|
Fixes #704
|
||||||
|
---
|
||||||
|
poppler/FileSpec.cc | 9 +++++----
|
||||||
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/poppler/FileSpec.cc b/poppler/FileSpec.cc
|
||||||
|
index 8a8b9e7e..7c12da63 100644
|
||||||
|
--- a/poppler/FileSpec.cc
|
||||||
|
+++ b/poppler/FileSpec.cc
|
||||||
|
@@ -133,11 +133,12 @@ FileSpec::FileSpec(const Object *fileSpecA)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- }
|
||||||
|
|
||||||
|
- obj1 = fileSpec.dictLookup("Desc");
|
||||||
|
- if (obj1.isString())
|
||||||
|
- desc = obj1.getString()->copy();
|
||||||
|
+ obj1 = fileSpec.dictLookup("Desc");
|
||||||
|
+ if (obj1.isString()) {
|
||||||
|
+ desc = obj1.getString()->copy();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
FileSpec::~FileSpec()
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
@ -4,7 +4,7 @@
|
|||||||
Summary: PDF rendering library
|
Summary: PDF rendering library
|
||||||
Name: poppler
|
Name: poppler
|
||||||
Version: 0.67.0
|
Version: 0.67.0
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
|
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
|
||||||
URL: http://poppler.freedesktop.org/
|
URL: http://poppler.freedesktop.org/
|
||||||
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
|
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
|
||||||
@ -40,6 +40,9 @@ Patch12: poppler-0.67.0-valid-embedded-file-name.patch
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1665259
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1665259
|
||||||
Patch13: poppler-0.67.0-rich-media-annotation.patch
|
Patch13: poppler-0.67.0-rich-media-annotation.patch
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1665263
|
||||||
|
Patch14: poppler-0.67.0-filespec.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
@ -270,6 +273,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 21 2019 Marek Kasik <mkasik@redhat.com> - 0.67.0-8
|
||||||
|
- Move the fileSpec.dictLookup call inside fileSpec.isDict if
|
||||||
|
- Resolves: #1665264
|
||||||
|
|
||||||
* Mon Jan 21 2019 Marek Kasik <mkasik@redhat.com> - 0.67.0-7
|
* Mon Jan 21 2019 Marek Kasik <mkasik@redhat.com> - 0.67.0-7
|
||||||
- Do not try to construct invalid rich media annotation assets
|
- Do not try to construct invalid rich media annotation assets
|
||||||
- Resolves: #1665260
|
- Resolves: #1665260
|
||||||
|
Loading…
Reference in New Issue
Block a user