* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Handle zero-contour

17 years ago · 89d64fa6e3
parent a2f17cc150
commit 89d64fa6e3
2 changed files with 10 additions and 1 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2008-05-17  Sam Hocevar  <samh>
+
+	* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Handle zero-contour
+	glyphs correctly.  Patch from Savannah bug #23277.
+
 2008-05-16  Werner Lemberg  <wl@gnu.org>

 	* docs/CHANGES: Updated.
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@ -267,7 +267,11 @@
    if ( n_contours >= 0xFFF || p + ( n_contours + 1 ) * 2 > limit )
      goto Invalid_Outline;

-    cont[0] = prev_cont = FT_NEXT_USHORT( p );
+    prev_cont = FT_NEXT_USHORT( p );
+
+    if ( n_contours > 0 )
+      cont[0] = prev_cont;
+
    for ( cont++; cont < cont_limit; cont++ )
    {
      cont[0] = FT_NEXT_USHORT( p );