shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix Savannah bug #41697, part 2.

* src/cff/cf2ft.c (cf2_initLocalRegionBuffer,
cf2_initGlobalRegionBuffer): It is possible for a charstring to call
a subroutine if no subroutines exist.  This is an error but should
not trigger an assert.  Split the assert to account for this.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,14 @@

 2014-02-28  Dave Arnold  <[email protected]>

+	[cff] Fix Savannah bug #41697, part 2.

+

+	* src/cff/cf2ft.c (cf2_initLocalRegionBuffer,

+	cf2_initGlobalRegionBuffer): It is possible for a charstring to call

+	a subroutine if no subroutines exist.  This is an error but should

+	not trigger an assert.  Split the assert to account for this.

+

+2014-02-28  Dave Arnold  <[email protected]>

+

 	[cff] Fix Savannah bug #41697, part 1.

 	* src/cff/cf2hints.c (cf2_hintmap_build): Return when `hintMask' is

--- a/src/cff/cf2ft.c

+++ b/src/cff/cf2ft.c

@@ -521,7 +521,7 @@

                               CF2_UInt      idx,

                               CF2_Buffer    buf )

   {

-    FT_ASSERT( decoder && decoder->globals );

+    FT_ASSERT( decoder );

     FT_ZERO( buf );

@@ -529,6 +529,8 @@

     if ( idx >= decoder->num_globals )

       return TRUE;     /* error */

+    FT_ASSERT( decoder->globals );

+

     buf->start =

     buf->ptr   = decoder->globals[idx];

     buf->end   = decoder->globals[idx + 1];

@@ -594,7 +596,7 @@

                              CF2_UInt      idx,

                              CF2_Buffer    buf )

   {

-    FT_ASSERT( decoder && decoder->locals );

+    FT_ASSERT( decoder );

     FT_ZERO( buf );

@@ -601,6 +603,8 @@

     idx += decoder->locals_bias;

     if ( idx >= decoder->num_locals )

       return TRUE;     /* error */

+

+    FT_ASSERT( decoder->locals );

     buf->start =

     buf->ptr   = decoder->locals[idx];