packages/poppler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 poppler: fix cves

Browse Source 
Merge pull request !2 from orange-snn/master
This commit is contained in:
openeuler-ci-bot 2020-01-20 19:42:11 +08:00 committed by Gitee
commit 485287d61f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CVE-2018-19059.patch
View File

@ -20,13 +20,13 @@ index 846584a4..a8720c64 100644
- if (!fileSpec->getEmbeddedFile()->save(path)) { - if (!fileSpec->getEmbeddedFile()->save(path)) {
+ auto *embFile = fileSpec->getEmbeddedFile(); + auto *embFile = fileSpec->getEmbeddedFile();
+ if (!embFile || !embFile->isOk()) { + if (!embFile || !embFile->isOk()) {
+ exitCode = 3; + exitCode = 3;
+ goto err2; + goto err2;
+ } + }
+ if (!embFile->save(path)) { + if (!embFile->save(path)) {
error(errIO, -1, "Error saving embedded file as '{0:s}'", p); error(errIO, -1, "Error saving embedded file as '{0:s}'", p);
exitCode = 2; exitCode = 2;
goto err2; goto err2;
@@ -295,7 +300,12 @@ int main(int argc, char *argv[]) { @@ -295,7 +300,12 @@ int main(int argc, char *argv[]) {
p = path; p = path;
} }
@ -43,4 +43,3 @@ index 846584a4..a8720c64 100644
goto err2; goto err2;
-- --
2.24.1 2.24.1

8
poppler.spec
View File

@ -3,7 +3,7 @@
Name: poppler Name: poppler
Version: 0.67.0 Version: 0.67.0
Release: 4 Release: 5
Summary: Poppler is a PDF rendering library based on the xpdf-3.0 code base Summary: Poppler is a PDF rendering library based on the xpdf-3.0 code base
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
URL: https://poppler.freedesktop.org/ URL: https://poppler.freedesktop.org/
@ -238,6 +238,12 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.67.0-5
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:fix cves
* Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.67.0-4 * Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.67.0-4
- Type:cve - Type:cve
- Id:NA - Id:NA