Attachment #206120 for bug #239165

Lines 3-8 Link Here

(-)Makefile (+1 lines)
3		3
4	PORTNAME= freetype2	4	PORTNAME= freetype2
5	PORTVERSION= 2.10.1	5	PORTVERSION= 2.10.1
		6	PORTREVISION= 1
6	CATEGORIES= print	7	CATEGORIES= print
7	MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \	8	MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \
8	SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \	9	SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \




# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=12e4307dc7b48c9a4a4fc3ac6c32220874ab18ec
# [sfnt, winfonts] Avoid memory leaks in case of error (#56587).
# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b110acba9e6f7e40314f0da5d249cb3cb3beeab8
# * src/cid/cidload.c (cid_hex_to_binary): Fix typo (#56653).
# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=d5522ac0603a15bd87f795d36dc218681befe022
# * src/base/ftbbox.c (cubic_peak): Sanitize left shift (#56586).
# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=12af46b649fdb946bacf150428e5cdfc3470a7ca

--- src/base/ftbbox.c.orig	2019-05-12 19:07:18 UTC
+++ src/base/ftbbox.c
@@ -294,10 +294,10 @@
       if ( shift > 2 )
         shift = 2;
 
-      q1 <<=  shift;
-      q2 <<=  shift;
-      q3 <<=  shift;
-      q4 <<=  shift;
+      q1 *= 1 << shift;
+      q2 *= 1 << shift;
+      q3 *= 1 << shift;
+      q4 *= 1 << shift;
     }
     else
     {
--- src/cid/cidload.c.orig	2019-03-07 08:40:25 UTC
+++ src/cid/cidload.c
@@ -715,7 +715,7 @@
       if ( ft_isdigit( *p ) )
         val = (FT_Byte)( *p - '0' );
       else if ( *p >= 'a' && *p <= 'f' )
-        val = (FT_Byte)( *p - 'a' );
+        val = (FT_Byte)( *p - 'a' + 10 );
       else if ( *p >= 'A' && *p <= 'F' )
         val = (FT_Byte)( *p - 'A' + 10 );
       else if ( *p == ' '  ||
--- src/psaux/psintrp.c.orig	2019-03-05 10:28:19 UTC
+++ src/psaux/psintrp.c
@@ -1433,6 +1433,13 @@

Return to bug 239165

Lines 6-12 Link Here

(-)files/patch-2.10.1.diff (+32 lines)
6	# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=12e4307dc7b48c9a4a4fc3ac6c32220874ab18ec	6	# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=12e4307dc7b48c9a4a4fc3ac6c32220874ab18ec
7	# [sfnt, winfonts] Avoid memory leaks in case of error (#56587).	7	# [sfnt, winfonts] Avoid memory leaks in case of error (#56587).
8	# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b110acba9e6f7e40314f0da5d249cb3cb3beeab8	8	# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b110acba9e6f7e40314f0da5d249cb3cb3beeab8
		9	# * src/cid/cidload.c (cid_hex_to_binary): Fix typo (#56653).
		10	# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=d5522ac0603a15bd87f795d36dc218681befe022
		11	# * src/base/ftbbox.c (cubic_peak): Sanitize left shift (#56586).
		12	# http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=12af46b649fdb946bacf150428e5cdfc3470a7ca
9		13
		14	--- src/base/ftbbox.c.orig 2019-05-12 19:07:18 UTC
		15	+++ src/base/ftbbox.c
		16	@@ -294,10 +294,10 @@
		17	if ( shift > 2 )
		18	shift = 2;
		19
		20	- q1 <<= shift;
		21	- q2 <<= shift;
		22	- q3 <<= shift;
		23	- q4 <<= shift;
		24	+ q1 *= 1 << shift;
		25	+ q2 *= 1 << shift;
		26	+ q3 *= 1 << shift;
		27	+ q4 *= 1 << shift;
		28	}
		29	else
		30	{
		31	--- src/cid/cidload.c.orig 2019-03-07 08:40:25 UTC
		32	+++ src/cid/cidload.c
		33	@@ -715,7 +715,7 @@
		34	if ( ft_isdigit( *p ) )
		35	val = (FT_Byte)( *p - '0' );
		36	else if ( p >= 'a' && p <= 'f' )
		37	- val = (FT_Byte)( *p - 'a' );
		38	+ val = (FT_Byte)( *p - 'a' + 10 );
		39	else if ( p >= 'A' && p <= 'F' )
		40	val = (FT_Byte)( *p - 'A' + 10 );
		41	else if ( *p == ' ' \|\|
10	--- src/psaux/psintrp.c.orig 2019-03-05 10:28:19 UTC	42	--- src/psaux/psintrp.c.orig 2019-03-05 10:28:19 UTC
11	+++ src/psaux/psintrp.c	43	+++ src/psaux/psintrp.c
12	@@ -1433,6 +1433,13 @@	44	@@ -1433,6 +1433,13 @@