[truetype] Fix Savannah bug #35689.

* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check first outline point.
13 years ago · 0fc8debeb6
parent 6ac022dc75
commit 0fc8debeb6
2 changed files with 12 additions and 2 deletions
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2012-03-02  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix Savannah bug #35689.
+
+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check first outline
+	point.
+
 2012-03-01  Werner Lemberg  <wl@gnu.org>

 	[bdf] Fix Savannah bug #35656.
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@ -362,14 +362,17 @@
    if ( n_contours >= 0xFFF || p + ( n_contours + 1 ) * 2 > limit )
      goto Invalid_Outline;

-    prev_cont = FT_NEXT_USHORT( p );
+    prev_cont = FT_NEXT_SHORT( p );

    if ( n_contours > 0 )
      cont[0] = prev_cont;

+    if ( prev_cont < 0 )
+      goto Invalid_Outline;
+
    for ( cont++; cont < cont_limit; cont++ )
    {
-      cont[0] = FT_NEXT_USHORT( p );
+      cont[0] = FT_NEXT_SHORT( p );
      if ( cont[0] <= prev_cont )
      {
        /* unordered contours: this is invalid */