Attachment #192577 for bug #227568

View | Details | Raw Unified | Return to bug 227568
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME= freetype2	4	PORTNAME= freetype2
5	PORTVERSION= 2.9	5	PORTVERSION= 2.9
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= print	7	CATEGORIES= print
8	MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \	8	MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \
9	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/}/ \




# * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference.
# https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=29c759284e305ec428703c9a5831d0b1fc3497ef

--- src/truetype/ttinterp.c.orig	2018-01-03 18:00:19 UTC
+++ src/truetype/ttinterp.c
@@ -7532,8 +7532,16 @@
       return;
     }
 
-    for ( i = 0; i < num_axes; i++ )
-      args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
+    if ( coords )
+    {
+      for ( i = 0; i < num_axes; i++ )
+        args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
+    }
+    else
+    {
+      for ( i = 0; i < num_axes; i++ )
+        args[i] = 0;
+    }
   }
 
 

Return to bug 227568

Line 0 Link Here

(-)files/patch-src_truetype_ttinterp.c (+24 lines)
	1	# * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference.
	2	# https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=29c759284e305ec428703c9a5831d0b1fc3497ef
	3
	4	--- src/truetype/ttinterp.c.orig 2018-01-03 18:00:19 UTC
	5	+++ src/truetype/ttinterp.c
	6	@@ -7532,8 +7532,16 @@
	7	return;
	8	}
	9
	10	- for ( i = 0; i < num_axes; i++ )
	11	- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
	12	+ if ( coords )
	13	+ {
	14	+ for ( i = 0; i < num_axes; i++ )
	15	+ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
	16	+ }
	17	+ else
	18	+ {
	19	+ for ( i = 0; i < num_axes; i++ )
	20	+ args[i] = 0;
	21	+ }
	22	}
	23
	24