diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-04-20 15:10:54 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-04-21 00:04:34 -0400 |
| commit | bab9a8ba0f285a811b7b36291bdc3db33b6c2b60 (patch) | |
| tree | 45a4f856920786f04f69a360e13902979f0c49cb /gnu/packages/patches/graphite2-CVE-2017-5436.patch | |
| parent | f920e79426f51f1320dd4ffc164fc473df2158c3 (diff) | |
| download | gnu-guix-bab9a8ba0f285a811b7b36291bdc3db33b6c2b60.tar gnu-guix-bab9a8ba0f285a811b7b36291bdc3db33b6c2b60.tar.gz | |
gnu: graphite2: Add fixes for CVE-2017-5436 and other bugs.
* gnu/packages/fontutils.scm (graphite2)[replacement]: New field.
(graphite2/fixed): New variable.
* gnu/packages/patches/graphite2-CVE-2017-5436.patch,
gnu/packages/patches/graphite2-check-code-point-limit.patch,
gnu/packages/patches/graphite2-fix-32-bit-wrap-arounds.patch,
gnu/packages/patches/graphite2-non-linear-classes-even-number.patch:
New files.
* gnu/local.mk (dist_patch_DATA): Add them.
Diffstat (limited to 'gnu/packages/patches/graphite2-CVE-2017-5436.patch')
| -rw-r--r-- | gnu/packages/patches/graphite2-CVE-2017-5436.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/patches/graphite2-CVE-2017-5436.patch b/gnu/packages/patches/graphite2-CVE-2017-5436.patch new file mode 100644 index 0000000000..d7383ec8de --- /dev/null +++ b/gnu/packages/patches/graphite2-CVE-2017-5436.patch @@ -0,0 +1,25 @@ +From 1ce331d5548b98ed8b818532b2556d6f2c7a3b83 Mon Sep 17 00:00:00 2001 +From: Martin Hosken <martin_hosken@sil.org> +Date: Thu, 9 Mar 2017 22:04:04 +0000 +Subject: [PATCH] Ensure features have enough space. Fix from Mozilla + +--- + src/FeatureMap.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/FeatureMap.cpp b/src/FeatureMap.cpp +index b8c8405..83bd5f6 100644 +--- a/src/FeatureMap.cpp ++++ b/src/FeatureMap.cpp +@@ -275,7 +275,7 @@ bool FeatureRef::applyValToFeature(uint32 val, Features & pDest) const + else + if (pDest.m_pMap!=&m_pFace->theSill().theFeatureMap()) + return false; //incompatible +- pDest.reserve(m_index); ++ pDest.reserve(m_index+1); + pDest[m_index] &= ~m_mask; + pDest[m_index] |= (uint32(val) << m_bits); + return true; +-- +2.12.2 + |