From 0a24df16448aabafbab23edf058419c9f1010d16 Mon Sep 17 00:00:00 2001
From: chengquan <chengquan3@huawei.com>
Date: Tue, 17 Mar 2020 16:45:33 +0800
Subject: [PATCH 1/2] CVE-2019-14869

---
 CVE-2019-14869.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 CVE-2019-14869.patch

diff --git a/CVE-2019-14869.patch b/CVE-2019-14869.patch
new file mode 100644
index 0000000..5145226
--- /dev/null
+++ b/CVE-2019-14869.patch
@@ -0,0 +1,65 @@
+From 14a138786c76b266dcb873dd522442c49cacc985 Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Tue, 5 Nov 2019 09:45:27 +0000
+Subject: [PATCH] Bug 701841: remove .forceput from /.charkeys
+
+When loading Type 1 or Truetype fonts from disk, we attempt to extend the glyph
+name table to include all identifiable glyph names from the Adobe Glyph List.
+
+In the case of Type 1 fonts, the font itself (almost always) marks the
+CharStrings dictionary as read-only, hence we have to use .forceput for that
+case.
+
+But for Truetype fonts, the CharStrings dictionary is created internally and is
+not read-only until *after* we have fully populated it (including the extended
+glyph names from the AGL), hence there is no need for .forceput, and no need to
+carry the security risk of using it.
+
+Replace with regular put.
+---
+ Resource/Init/gs_ttf.ps | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Resource/Init/gs_ttf.ps b/Resource/Init/gs_ttf.ps
+index e34967d..5354ff0 100644
+--- a/Resource/Init/gs_ttf.ps
++++ b/Resource/Init/gs_ttf.ps
+@@ -1301,7 +1301,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef
+           TTFDEBUG { (\n1 setting alias: ) print dup ==only
+                 ( to be the same as  ) print 2 index //== exec } if
+ 
+-          7 index 2 index 3 -1 roll exch .forceput
++          7 index 2 index 3 -1 roll exch put
+         } forall
+         pop pop pop
+       }
+@@ -1319,7 +1319,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef
+           exch pop
+           TTFDEBUG { (\n2 setting alias: ) print 1 index ==only
+                      ( to use glyph index: ) print dup //== exec } if
+-          5 index 3 1 roll .forceput
++          5 index 3 1 roll put
+           //false
+         }
+         {
+@@ -1336,7 +1336,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef
+         {                            %  CharStrings(dict) isunicode(boolean) cmap(dict) RAGL(dict) gname(name) codep(integer) gindex(integer)
+           TTFDEBUG { (\3 nsetting alias: ) print 1 index ==only
+                 ( to be index: ) print dup //== exec } if
+-          exch pop 5 index 3 1 roll .forceput
++          exch pop 5 index 3 1 roll put
+         }
+         {
+           pop pop
+@@ -1366,7 +1366,7 @@ currentdict /.pickcmap_with_no_xlatmap .undef
+       } ifelse
+     ]
+   TTFDEBUG { (Encoding: ) print dup === flush } if
+-} .bind executeonly odef		% hides .forceput
++} .bind odef
+ 
+ % ---------------- CIDFontType 2 font loading ---------------- %
+ 
+-- 
+1.8.3.1
+
-- 
Gitee


From 8df3bfa09f29f1708db3a9df76011b4d284afe4b Mon Sep 17 00:00:00 2001
From: chengquan <chengquan3@huawei.com>
Date: Tue, 17 Mar 2020 16:47:16 +0800
Subject: [PATCH 2/2] fix CVE-2019-14869

---
 ghostscript.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/ghostscript.spec b/ghostscript.spec
index 1d4ea48..28fdcc3 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -9,16 +9,17 @@
 
 Name:             ghostscript
 Version:          9.27
-Release:          5
+Release:          6
 Summary:          An interpreter for PostScript and PDF files
 License:          AGPLv3+
 URL:              https://ghostscript.com/
 Source0:          https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs%{version_short}/ghostscript-%{version}.tar.xz
 
-# Patch6000 from http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5b85ddd19
-Patch6000: CVE-2019-10216.patch
-Patch6001: CVE-2019-14811-CVE-2019-14812-CVE-2019-14813.patch
-Patch6002: CVE-2019-14817.patch
+
+Patch0: CVE-2019-10216.patch
+Patch1: CVE-2019-14811-CVE-2019-14812-CVE-2019-14813.patch
+Patch2: CVE-2019-14817.patch
+Patch3: CVE-2019-14869.patch
 
 BuildRequires:    automake gcc
 BuildRequires:    adobe-mappings-cmap-devel adobe-mappings-pdf-devel
@@ -179,6 +180,12 @@ make check
 %{_bindir}/dvipdf
 
 %changelog
+* Tue Jan 7 2020 chengquan<chengquan3@huawei.com> - 9.27-6
+- Type:CVE
+- ID:NA
+- SUG:NA
+- DESC:fix CVE-2019-14869
+
 * Tue Jan 7 2020 chengquan<chengquan3@huawei.com> - 9.27-5
 - Type:CVE
 - ID:NA
-- 
Gitee