shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[type1] Fix Savannah bug #35847.

* src/type1/t1load.c (parse_subrs): Fix the loop exit condition;
we want to exit when we have run out of data.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,6 +1,13 @@

+2012-03-17  Chris Liddell  <[email protected]>

+

+	[type1] Fix Savannah bug #35847.

+

+	* src/type1/t1load.c (parse_subrs): Fix the loop exit condition;

+	we want to exit when we have run out of data.

+

 2012-03-16  Werner Lemberg  <[email protected]>

-	[bdf] Really fix 35658.

+	[bdf] Really fix Savannah bug #35658.

 	* src/bdf/bdflib.c (_bdf_list_split): Add one more `field' initializer.

--- a/src/type1/t1load.c

+++ b/src/type1/t1load.c

@@ -1399,9 +1399,10 @@

       FT_Byte*  base;

-      /* If the next token isn't `dup' we are done. */

-      if ( parser->root.cursor + 4 < parser->root.limit            &&

-           ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )

+      /* If we are out of data, or if the next token isn't `dup', */

+      /* we are done.                                             */

+      if ( parser->root.cursor + 4 >= parser->root.limit          ||

+          ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )

         break;

       T1_Skip_PS_Token( parser );       /* `dup' */