From 748e3681734eb40952f2eabb61ae90f5f7e7b2a2 Mon Sep 17 00:00:00 2001 From: Dave Arnold Date: Wed, 21 Oct 2015 13:58:43 +0200 Subject: [PATCH] [cff] Remove an assert (#46107). * src/cff/cf2hints.c (cf2_hintmap_insertHint): Ignore paired edges in wrong order. --- ChangeLog | 7 +++++++ src/cff/cf2hints.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cac6c7500..6af1970db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-10-21 Dave Arnold + + [cff] Remove an assert (#46107). + + * src/cff/cf2hints.c (cf2_hintmap_insertHint): Ignore paired edges + in wrong order. + 2015-10-21 Werner Lemberg [sfnt] Avoid unnecessarily large allocation for WOFFs (#46257). diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c index 0e2700021..bbbe8e3c3 100644 --- a/src/cff/cf2hints.c +++ b/src/cff/cf2hints.c @@ -587,8 +587,9 @@ } /* paired edges must be in proper order */ - FT_ASSERT( !isPair || - topHintEdge->csCoord >= bottomHintEdge->csCoord ); + if ( isPair && + topHintEdge->csCoord < bottomHintEdge->csCoord ) + return; /* linear search to find index value of insertion point */ indexInsert = 0;