svn commit: r438984 - in head/graphics/graphite2: . files

[Jung-uk Kim]

Author: jkim
Date: Thu Apr 20 18:40:09 2017
New Revision: 438984
URL: https://svnweb.freebsd.org/changeset/ports/438984

Log:
  Add two upstream patches to fix CVE-2017-5436.
  
  https://github.com/silnrsi/graphite/commit/1ce331d
  https://github.com/silnrsi/graphite/commit/b23d7b9
  
  PR:		218771
  MFH:		2017Q2

Added:
  head/graphics/graphite2/files/
  head/graphics/graphite2/files/patch-src_FeatureMap.cpp   (contents, props changed)
Modified:
  head/graphics/graphite2/Makefile

Modified: head/graphics/graphite2/Makefile
==============================================================================
--- head/graphics/graphite2/Makefile	Thu Apr 20 16:59:10 2017	(r438983)
+++ head/graphics/graphite2/Makefile	Thu Apr 20 18:40:09 2017	(r438984)
@@ -2,6 +2,7 @@
 
 PORTNAME=	graphite2
 PORTVERSION=	1.3.9
+PORTREVISION=	1
 CATEGORIES=	graphics print
 
 MAINTAINER=	office at FreeBSD.org

Added: head/graphics/graphite2/files/patch-src_FeatureMap.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/graphite2/files/patch-src_FeatureMap.cpp	Thu Apr 20 18:40:09 2017	(r438984)
@@ -0,0 +1,12 @@
+--- src/FeatureMap.cpp.orig	2016-11-11 09:53:21 UTC
++++ src/FeatureMap.cpp
+@@ -275,7 +275,8 @@ bool FeatureRef::applyValToFeature(uint3
+     else
+       if (pDest.m_pMap!=&m_pFace->theSill().theFeatureMap())
+         return false;       //incompatible
+-    pDest.reserve(m_index);
++    if (m_index >= pDest.size())
++        pDest.resize(m_index+1);
+     pDest[m_index] &= ~m_mask;
+     pDest[m_index] |= (uint32(val) << m_bits);
+     return true;