diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-05-27 03:39:12 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-05-27 03:39:12 -0400 |
| commit | 54d9479d8adf86e486d02267427829f43e7042b6 (patch) | |
| tree | f4f1d7a9e0856bee3dadd1f7e2999159302275cb /gnu/packages/patches/graphite2-CVE-2017-5436.patch | |
| parent | 52cabc6f87eb1ceebd953b423e458e3c48f847ca (diff) | |
| parent | d771ba62f8b23cf71ad82b3423da36416e8a1e8d (diff) | |
| download | guix-patches-54d9479d8adf86e486d02267427829f43e7042b6.tar guix-patches-54d9479d8adf86e486d02267427829f43e7042b6.tar.gz | |
Merge branch 'master' into core-updates
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, 0 insertions, 25 deletions
diff --git a/gnu/packages/patches/graphite2-CVE-2017-5436.patch b/gnu/packages/patches/graphite2-CVE-2017-5436.patch deleted file mode 100644 index d7383ec8de..0000000000 --- a/gnu/packages/patches/graphite2-CVE-2017-5436.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - |