Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > ace0c7d5943399be8235d684d03fb2e5 > files > 6

freetype-2.2.1-28.el5_7.1.src.rpm

--- freetype-2.2.1/src/base/ftobjs.c	2004-06-21 23:16:56.000000000 +0200
+++ freetype-2.2.1/src/base/ftobjs.c	2010-07-14 14:19:24.000000000 +0200
@@ -1192,7 +1192,19 @@
         goto Exit;
       if ( FT_READ_USHORT( flags ) )
         goto Exit;
-      rlen -= 2;                    /* the flags are part of the resource */
+      FT_TRACE3(( "POST fragment[%d]: offsets=0x%08x, rlen=0x%08x, flags=0x%04x\n",
+                   i, offsets[i], rlen, flags ));
+
+      if ( ( flags >> 8 ) == 0 )        /* Comment, should not be loaded */
+        continue;
+
+      /* the flags are part of the resource, so rlen >= 2.  */
+      /* but some fonts declare rlen = 0 for empty fragment */
+      if ( rlen > 2 )
+        rlen -= 2;
+      else
+        rlen = 0;
+
       if ( ( flags >> 8 ) == type )
         len += rlen;
       else