* src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Fix algorithm for

19 years ago · 9b15ea341c
parent ad83071620
commit 9b15ea341c
2 changed files with 12 additions and 2 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2006-09-29  Werner Lemberg  <wl@gnu.org>
+
+	* src/sfnt/ttcmap.c (tt_cmap4_char_map_binary): Fix algorithm for
+	overlapping segments.  Bug reported by Stefan Koch.
+
 2006-09-28  David Turner  <david@freetype.org>

        * include/freetype/internal/ftobjs.h, src/truetype/ttobjs.c,
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@ -1094,14 +1094,19 @@
          /* search in segments before the current segment */
          for ( i = max ; i > 0; i-- )
          {
-            FT_UInt  prev_end;
+            FT_UInt   prev_end;
+            FT_Byte*  old_p;


-            p = cmap->data + 14 + ( i - 1 ) * 2;
+            old_p    = p;
+            p        = cmap->data + 14 + ( i - 1 ) * 2;
            prev_end = TT_PEEK_USHORT( p );

            if ( charcode > prev_end )
+            {
+              p = old_p;
              break;
+            }

            end    = prev_end;
            p     += 2 + num_segs2;